Merge "Remove libcodec2_vndk from vndk" into qt-dev
diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
index 2c6c0a2..2184219 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2200",
    "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-1707",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2250",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3612",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3782",
-   "self_type" : "type-3781",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4205",
-   "self_type" : "type-4204",
+   "referenced_type" : "type-4181",
+   "self_type" : "type-4180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4319",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4730",
-   "self_type" : "type-4729",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4701",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -147,8 +147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -156,8 +156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -165,8 +165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -174,8 +174,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -183,49 +183,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2123",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2263",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -233,8 +224,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -242,143 +233,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2264",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2993",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3374",
-   "self_type" : "type-3373",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3777",
-   "self_type" : "type-3776",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4201",
-   "self_type" : "type-4200",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4314",
-   "self_type" : "type-4313",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4726",
-   "self_type" : "type-4725",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -387,7 +252,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -396,7 +261,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -405,7 +270,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -414,7 +279,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -423,7 +288,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -432,7 +297,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -441,7 +306,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -450,7 +315,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -463,8 +328,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -473,8 +338,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -483,24 +348,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -508,8 +373,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -517,16 +382,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 8
   },
   {
@@ -534,8 +399,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -543,8 +408,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -552,8 +417,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -582,8 +447,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 4
   },
   {
@@ -592,8 +457,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -602,15 +467,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -1033,10 +898,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1174,6 +1039,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1512,6 +1380,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1520,9 +1392,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1598,10 +1486,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1811,7 +1695,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1885,8 +1769,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1963,8 +1847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2017,8 +1901,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2115,8 +1999,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2161,8 +2045,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2211,8 +2095,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2261,8 +2145,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2303,8 +2187,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "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",
@@ -2369,8 +2253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2395,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2437,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2591,8 +2475,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2637,8 +2521,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2679,8 +2563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2737,8 +2621,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2675,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2833,8 +2717,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2879,8 +2763,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2917,8 +2801,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2839,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3013,8 +2897,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3047,8 +2931,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3081,8 +2965,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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",
@@ -3123,8 +3007,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3165,8 +3049,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3191,8 +3075,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3229,8 +3113,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3283,8 +3167,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3525,8 +3409,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3571,8 +3455,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3677,8 +3561,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3719,8 +3603,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3745,8 +3629,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3923,11 +3807,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3997,8 +3881,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4063,8 +3947,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4097,8 +3981,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4143,8 +4027,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4213,8 +4097,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4279,8 +4163,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4329,8 +4213,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4371,8 +4255,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4421,8 +4305,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4463,8 +4347,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4657,8 +4541,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5355,8 +5239,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5517,8 +5401,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5559,8 +5443,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5597,8 +5481,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5635,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5677,8 +5561,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5715,8 +5599,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5745,8 +5629,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5675,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5833,8 +5717,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5883,8 +5767,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5917,8 +5801,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5951,8 +5835,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5989,8 +5873,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5911,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6061,8 +5945,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6099,8 +5983,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6153,8 +6037,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6179,8 +6063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6205,8 +6089,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6311,8 +6195,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6349,8 +6233,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6371,8 +6255,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6425,8 +6309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6463,8 +6347,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6545,8 +6429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6595,8 +6479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6653,8 +6537,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6715,8 +6599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6773,8 +6657,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6961,8 +6845,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7003,8 +6887,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7041,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7083,8 +6967,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7179,8 +7063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7245,8 +7129,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7335,8 +7219,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7393,8 +7277,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7435,8 +7319,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7473,8 +7357,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7499,8 +7383,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7577,8 +7461,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7631,8 +7515,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7673,8 +7557,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7623,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7781,8 +7665,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7839,8 +7723,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7865,8 +7749,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7891,8 +7775,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7937,8 +7821,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7983,8 +7867,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8013,8 +7897,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8071,8 +7955,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8137,8 +8021,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8171,8 +8055,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8237,8 +8121,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8295,8 +8179,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8317,8 +8201,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8335,65 +8219,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8432,8 +8265,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8470,8 +8303,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8500,8 +8333,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8522,8 +8355,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8556,11 +8389,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8582,8 +8415,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8609,8 +8442,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8627,8 +8460,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8645,8 +8478,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8671,8 +8504,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8713,8 +8546,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8775,11 +8608,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8879,8 +8712,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8905,8 +8738,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8947,8 +8780,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9189,8 +9022,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9219,8 +9052,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2108",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9249,8 +9082,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9291,8 +9124,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9329,8 +9162,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9355,8 +9188,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9373,8 +9206,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9403,8 +9236,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9497,8 +9330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9539,8 +9372,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9557,8 +9390,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2114",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9587,8 +9420,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9621,8 +9454,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9675,8 +9508,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9692,12 +9525,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9707,15 +9540,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9725,24 +9558,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9752,27 +9585,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9782,24 +9615,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9809,18 +9642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9830,21 +9663,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9854,18 +9687,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9875,15 +9708,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9893,18 +9726,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9914,24 +9747,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9941,18 +9774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9962,18 +9795,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9983,24 +9816,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10010,18 +9843,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10031,13 +9864,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -10046,12 +9879,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10061,12 +9894,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2156",
-   "return_type" : "type-67",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2128",
+   "return_type" : "type-60",
+   "self_type" : "type-2128",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -10076,27 +9909,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -10108,10 +9941,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -10122,10 +9955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1994"
+     "referenced_type" : "type-1964"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10136,10 +9969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2003"
+     "referenced_type" : "type-1973"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10150,10 +9983,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10163,13 +9996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10179,20 +10012,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10202,7 +10035,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10211,7 +10044,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10221,13 +10054,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10237,26 +10070,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10266,16 +10099,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10285,16 +10118,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2538"
+     "referenced_type" : "type-2526"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10305,22 +10138,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-2522"
     },
     {
-     "referenced_type" : "type-2495"
+     "referenced_type" : "type-2471"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10331,10 +10164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10347,19 +10180,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10370,10 +10203,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10386,19 +10219,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10409,25 +10242,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10438,7 +10271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10453,13 +10286,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10470,13 +10303,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10486,10 +10319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10500,16 +10333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10520,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10529,7 +10362,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10539,13 +10372,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10556,10 +10389,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10570,13 +10403,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10419,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10435,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,7 +10455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10631,7 +10464,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10642,7 +10475,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10651,7 +10484,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10661,16 +10494,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10681,13 +10514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10698,10 +10531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10712,13 +10545,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10728,16 +10561,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10748,13 +10581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10765,7 +10598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10774,7 +10607,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10785,19 +10618,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10808,13 +10641,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10825,19 +10658,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10848,13 +10681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10865,19 +10698,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10887,7 +10720,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10896,16 +10729,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10916,25 +10749,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10945,19 +10778,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10967,16 +10800,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10987,13 +10820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11004,16 +10837,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11023,22 +10856,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11049,19 +10882,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11072,25 +10905,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11100,13 +10933,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -11115,7 +10948,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11126,22 +10959,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11152,22 +10985,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11178,19 +11011,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11200,10 +11033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11213,13 +11046,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11228,10 +11061,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11241,10 +11074,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11253,7 +11086,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11263,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11276,10 +11109,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11289,19 +11122,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11311,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11333,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11349,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11365,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11387,19 +11220,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11409,19 +11242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11432,10 +11265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11446,10 +11279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11460,10 +11293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11472,13 +11305,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11487,13 +11320,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11502,10 +11335,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11514,13 +11347,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11529,19 +11362,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11551,10 +11384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11564,10 +11397,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11577,16 +11410,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11598,7 +11431,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11608,10 +11441,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11621,13 +11454,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11637,13 +11470,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11653,13 +11486,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11668,10 +11501,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11681,13 +11514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11697,13 +11530,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11713,13 +11546,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11729,13 +11562,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-1933"
+     "referenced_type" : "type-1904"
     }
    ],
-   "return_type" : "type-2553",
+   "return_type" : "type-2543",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11745,13 +11578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11761,13 +11594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11777,10 +11610,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11790,10 +11623,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11803,13 +11636,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11819,16 +11652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2072"
+     "referenced_type" : "type-2043"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11838,10 +11671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11851,13 +11684,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11867,13 +11700,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11883,10 +11716,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2556",
+   "return_type" : "type-2546",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11896,10 +11729,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2557",
+   "return_type" : "type-2547",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11909,13 +11742,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2558",
+   "return_type" : "type-2548",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11925,16 +11758,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2075"
+     "referenced_type" : "type-2047"
     }
    ],
-   "return_type" : "type-2559",
+   "return_type" : "type-2549",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11944,10 +11777,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2560",
+   "return_type" : "type-2550",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11957,13 +11790,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11973,13 +11806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11989,16 +11822,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2563",
+   "return_type" : "type-2553",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12008,13 +11841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2564",
+   "return_type" : "type-2554",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12024,13 +11857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2565",
+   "return_type" : "type-2555",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12040,13 +11873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-2566",
+   "return_type" : "type-2556",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12056,13 +11889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2567",
+   "return_type" : "type-2557",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12072,16 +11905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-2568",
+   "return_type" : "type-2558",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12091,13 +11924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-2570"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-2569",
+   "return_type" : "type-2559",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12107,10 +11940,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-2571",
+   "return_type" : "type-2561",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12120,13 +11953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2572",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12136,16 +11969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-2573",
+   "return_type" : "type-2563",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12155,13 +11988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-2575",
+   "return_type" : "type-2565",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12171,13 +12004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12187,13 +12020,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12203,16 +12036,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12222,19 +12055,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-2579"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-2578",
+   "return_type" : "type-2568",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12244,13 +12077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2581"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-2580",
+   "return_type" : "type-2570",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12260,13 +12093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2510"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12276,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-2582",
+   "return_type" : "type-2572",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12292,10 +12125,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12305,10 +12138,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12318,10 +12151,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12331,10 +12164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12344,10 +12177,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12357,13 +12190,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-2584",
+   "return_type" : "type-2574",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12373,13 +12206,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-2586",
+   "return_type" : "type-2576",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12389,13 +12222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-2588",
+   "return_type" : "type-2578",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12405,79 +12238,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-2589",
+   "return_type" : "type-2579",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12487,10 +12320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12500,10 +12333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12513,10 +12346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12526,20 +12359,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12549,7 +12382,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12558,7 +12391,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12568,26 +12401,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12597,16 +12430,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12616,16 +12449,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12635,19 +12468,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12657,19 +12490,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12679,13 +12512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1768"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12695,13 +12528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12711,16 +12544,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12730,7 +12563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12739,16 +12572,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,16 +12591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12777,22 +12610,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12802,13 +12635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12817,7 +12650,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12827,10 +12660,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12840,19 +12673,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12862,19 +12695,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12884,19 +12717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12906,13 +12739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12922,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12938,19 +12771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2593",
+   "return_type" : "type-2583",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,7 +12793,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12969,7 +12802,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2594",
+   "return_type" : "type-2584",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12979,25 +12812,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2595",
+   "return_type" : "type-2585",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13007,16 +12840,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2596",
+   "return_type" : "type-2586",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13026,16 +12859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-2597",
+   "return_type" : "type-2587",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13045,19 +12878,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2600"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-2599",
+   "return_type" : "type-2589",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13067,16 +12900,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2601",
+   "return_type" : "type-2591",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13086,13 +12919,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1788"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-2602",
+   "return_type" : "type-2592",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-2603",
+   "return_type" : "type-2593",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13118,16 +12951,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1783"
+     "referenced_type" : "type-1753"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2595"
     }
    ],
-   "return_type" : "type-2604",
+   "return_type" : "type-2594",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,19 +12970,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2607"
+     "referenced_type" : "type-2597"
     }
    ],
-   "return_type" : "type-2606",
+   "return_type" : "type-2596",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13159,16 +12992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2609"
+     "referenced_type" : "type-2599"
     }
    ],
-   "return_type" : "type-2608",
+   "return_type" : "type-2598",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,22 +13011,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2611"
+     "referenced_type" : "type-2601"
     }
    ],
-   "return_type" : "type-2610",
+   "return_type" : "type-2600",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13203,13 +13036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13218,7 +13051,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2612",
+   "return_type" : "type-2602",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13228,10 +13061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-2613",
+   "return_type" : "type-2603",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13241,19 +13074,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2615"
+     "referenced_type" : "type-2605"
     }
    ],
-   "return_type" : "type-2614",
+   "return_type" : "type-2604",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13263,16 +13096,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2616",
+   "return_type" : "type-2606",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13282,19 +13115,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-2618"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-2617",
+   "return_type" : "type-2607",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13304,13 +13137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13320,13 +13153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13337,10 +13170,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13351,10 +13184,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13364,10 +13211,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13376,7 +13223,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13386,16 +13233,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2088"
+     "referenced_type" : "type-2075"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13405,22 +13252,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2210"
+     "referenced_type" : "type-2184"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2185"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13430,13 +13277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13447,13 +13294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13464,13 +13311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13480,10 +13327,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13493,10 +13340,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13506,10 +13353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13519,10 +13366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13532,10 +13379,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13546,16 +13393,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13566,16 +13413,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13586,16 +13433,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13606,19 +13453,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13629,19 +13476,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13652,19 +13499,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13675,19 +13522,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13698,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13718,16 +13565,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13738,16 +13585,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13758,19 +13605,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13781,19 +13628,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13804,19 +13651,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13827,19 +13674,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13850,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13870,16 +13717,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13890,16 +13737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13910,19 +13757,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13933,19 +13780,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13956,19 +13803,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13979,19 +13826,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14002,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14022,16 +13869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14042,16 +13889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14062,19 +13909,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14085,19 +13932,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14108,19 +13955,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14131,19 +13978,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14154,16 +14001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14174,16 +14021,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14194,16 +14041,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14214,19 +14061,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14237,19 +14084,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14260,19 +14107,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14283,19 +14130,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14306,16 +14153,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14326,16 +14173,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14346,16 +14193,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14366,19 +14213,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14389,19 +14236,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14412,19 +14259,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14435,19 +14282,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14458,16 +14305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14478,16 +14325,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14498,16 +14345,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14518,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14541,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14564,19 +14411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14587,19 +14434,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14610,16 +14457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14630,16 +14477,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14650,16 +14497,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14670,19 +14517,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14693,19 +14540,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14716,19 +14563,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14739,19 +14586,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14762,16 +14609,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14782,16 +14629,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14802,16 +14649,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14822,19 +14669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14845,19 +14692,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14868,19 +14715,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14891,19 +14738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14914,16 +14761,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14934,16 +14781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14954,19 +14801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14977,19 +14824,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15000,19 +14847,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15023,19 +14870,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15046,16 +14893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15066,16 +14913,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15086,19 +14933,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15109,19 +14956,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15132,19 +14979,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15155,19 +15002,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15177,16 +15024,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15195,14 +15042,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15211,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15220,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15229,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15238,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15247,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15256,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3836",
+   "referenced_type" : "type-3808",
+   "self_type" : "type-3807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15265,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15274,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3037",
+   "self_type" : "type-3036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15283,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3843",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3814",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15292,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15301,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15310,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15319,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15328,8 +15169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15337,8 +15178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15346,8 +15187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15355,8 +15196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2910",
+   "self_type" : "type-2909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15364,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15373,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3314",
-   "self_type" : "type-3313",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15382,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15391,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3544",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15400,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3736",
-   "self_type" : "type-3735",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15409,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3940",
-   "self_type" : "type-3939",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15418,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4024",
-   "self_type" : "type-4023",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15427,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4194",
-   "self_type" : "type-4193",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15436,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4348",
-   "self_type" : "type-4347",
+   "referenced_type" : "type-4322",
+   "self_type" : "type-4321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15445,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15454,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4472",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15463,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15472,17 +15313,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2206",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15490,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15499,35 +15340,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2197",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15544,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15553,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15562,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15571,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15580,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15589,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15598,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15607,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15616,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15625,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2858",
-   "self_type" : "type-2857",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15634,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15643,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15652,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3312",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15661,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15670,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15679,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3679",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15688,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3752",
-   "self_type" : "type-3751",
+   "referenced_type" : "type-3725",
+   "self_type" : "type-3724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15697,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3915",
+   "self_type" : "type-3914",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15706,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4020",
-   "self_type" : "type-4019",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3992",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15715,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4183",
-   "self_type" : "type-4182",
+   "referenced_type" : "type-4161",
+   "self_type" : "type-4160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15724,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4304",
-   "self_type" : "type-4303",
+   "referenced_type" : "type-4278",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15733,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15742,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15751,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4594",
-   "self_type" : "type-4593",
+   "referenced_type" : "type-4568",
+   "self_type" : "type-4567",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15760,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15769,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15778,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15787,8 +15628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15796,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15805,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15814,8 +15655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15823,8 +15664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15832,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15841,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15850,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15859,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15868,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15877,8 +15718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15886,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15895,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15904,8 +15745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15913,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15922,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15931,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15949,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15958,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15967,8 +15808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15976,8 +15817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15985,8 +15826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15994,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16003,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -16012,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16021,8 +15862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16030,861 +15871,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2125",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3367",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3527",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3828",
-   "self_type" : "type-3830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4083",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4248",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4383",
-   "self_type" : "type-4385",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4522",
-   "self_type" : "type-4524",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4641",
-   "self_type" : "type-4643",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2205",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1976",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3037",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3355",
-   "self_type" : "type-3357",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3517",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3645",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3816",
-   "self_type" : "type-3818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4071",
-   "self_type" : "type-4073",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4238",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4324",
-   "self_type" : "type-4326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4511",
-   "self_type" : "type-4513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4631",
-   "self_type" : "type-4633",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1812",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3342",
-   "self_type" : "type-3344",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3503",
-   "self_type" : "type-3505",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3802",
-   "self_type" : "type-3804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4056",
-   "self_type" : "type-4058",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4224",
-   "self_type" : "type-4226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4367",
-   "self_type" : "type-4369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4496",
-   "self_type" : "type-4498",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4596",
-   "self_type" : "type-4598",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2057",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4165",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2089",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3006",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3329",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3490",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3786",
-   "self_type" : "type-3789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4042",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4357",
-   "self_type" : "type-4359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4609",
-   "self_type" : "type-4611",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16892,1025 +15878,44 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2075",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3027",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1956",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3349",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3810",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4062",
-   "self_type" : "type-4064",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4233",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4337",
-   "self_type" : "type-4339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4504",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4599",
-   "self_type" : "type-4601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2997",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3381",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4097",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4340",
-   "self_type" : "type-4342",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1933",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-4468",
-   "self_type" : "type-4470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-4330",
-   "self_type" : "type-4332",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1981",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3045",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3520",
-   "self_type" : "type-3522",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3825",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4078",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4241",
-   "self_type" : "type-4243",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4334",
-   "self_type" : "type-4336",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4636",
-   "self_type" : "type-4638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3350",
-   "self_type" : "type-3352",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3811",
-   "self_type" : "type-3813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4065",
-   "self_type" : "type-4067",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4197",
-   "self_type" : "type-4199",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4372",
-   "self_type" : "type-4375",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4505",
-   "self_type" : "type-4507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4626",
-   "self_type" : "type-4628",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1992",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3055",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3370",
-   "self_type" : "type-3372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3532",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3833",
-   "self_type" : "type-3835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4086",
-   "self_type" : "type-4088",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4253",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4390",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4529",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4648",
-   "self_type" : "type-4650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3016",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3500",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3797",
-   "self_type" : "type-3799",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4051",
-   "self_type" : "type-4053",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4221",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4343",
-   "self_type" : "type-4345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4490",
-   "self_type" : "type-4493",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4619",
-   "self_type" : "type-4621",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1796",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2085",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3324",
-   "self_type" : "type-3326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3487",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3785",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4206",
-   "self_type" : "type-4208",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4351",
-   "self_type" : "type-4353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4476",
-   "self_type" : "type-4478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4606",
-   "self_type" : "type-4608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-980",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1768",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1950",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
    "referenced_type" : "type-2092",
    "self_type" : "type-2094",
    "size" : 4,
@@ -17918,26 +15923,197 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3011",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3020",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3344",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4055",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4359",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4496",
+   "self_type" : "type-4498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4617",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2801",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3010",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
    "referenced_type" : "type-3332",
    "self_type" : "type-3334",
    "size" : 4,
@@ -17945,89 +16121,1124 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3493",
-   "self_type" : "type-3495",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3490",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3647",
-   "self_type" : "type-3649",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3794",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4045",
-   "self_type" : "type-4047",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4214",
-   "self_type" : "type-4216",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4327",
-   "self_type" : "type-4329",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4298",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4485",
-   "self_type" : "type-4487",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4614",
-   "self_type" : "type-4616",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4605",
+   "self_type" : "type-4607",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3480",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4028",
+   "self_type" : "type-4030",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4200",
+   "self_type" : "type-4202",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4341",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2240",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1915",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2979",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3465",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3759",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4187",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4329",
+   "self_type" : "type-4331",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4585",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1750",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1937",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3326",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3485",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4205",
+   "self_type" : "type-4207",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4311",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4479",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-980",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2970",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3354",
+   "self_type" : "type-3356",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3751",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4068",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4314",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1904",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4444",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-4304",
+   "self_type" : "type-4306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3013",
+   "self_type" : "type-3015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3339",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4050",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4219",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4308",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4612",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1940",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3329",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3455",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3783",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4039",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4177",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4347",
+   "self_type" : "type-4349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4602",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -18035,10 +17246,649 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3028",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3806",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4622",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1757",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1926",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2989",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4025",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4195",
+   "self_type" : "type-4197",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4319",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4468",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1767",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3303",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3754",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4009",
+   "self_type" : "type-4012",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4328",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4582",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1920",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2984",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3470",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3762",
+   "self_type" : "type-3764",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4020",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4190",
+   "self_type" : "type-4192",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4459",
+   "self_type" : "type-4461",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18046,8 +17896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2852",
+   "self_type" : "type-2854",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18055,8 +17905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3700",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18064,8 +17914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18073,8 +17923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18082,8 +17932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18091,8 +17941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18100,8 +17950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18109,8 +17959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18118,8 +17968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18127,8 +17977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18136,8 +17986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -18145,8 +17995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18154,8 +18004,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18163,8 +18013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18172,8 +18022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18181,8 +18031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18190,8 +18040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18199,8 +18049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -18208,8 +18058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18217,8 +18067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -18226,8 +18076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18235,8 +18085,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18244,8 +18094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18253,8 +18103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18262,8 +18112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18271,8 +18121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18280,8 +18130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18289,8 +18139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18298,8 +18148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18307,8 +18157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18316,8 +18166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18325,8 +18175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1928",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1900",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -18334,17 +18184,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-4464",
-   "self_type" : "type-4466",
+   "referenced_type" : "type-4438",
+   "self_type" : "type-4440",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3353",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18352,8 +18229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1938",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18361,8 +18238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18370,8 +18247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18379,8 +18256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18388,8 +18265,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18397,8 +18274,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18406,8 +18283,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-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18415,8 +18292,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-3207",
-   "self_type" : "type-3206",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18424,8 +18301,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-3320",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18433,8 +18310,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-3930",
-   "self_type" : "type-3929",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18442,8 +18319,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-4031",
-   "self_type" : "type-4030",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18451,8 +18328,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-4460",
-   "self_type" : "type-4459",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18460,8 +18337,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18469,8 +18346,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3622",
+   "self_type" : "type-3621",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18478,8 +18355,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18488,7 +18365,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18496,8 +18373,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -18508,8 +18385,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18517,8 +18394,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18526,8 +18403,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3697",
-   "self_type" : "type-3696",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18535,8 +18412,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4653",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18544,26 +18421,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18571,8 +18448,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18580,8 +18457,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18589,8 +18466,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18598,8 +18475,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18607,8 +18484,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18616,8 +18493,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18625,8 +18502,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18634,8 +18511,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2915",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18643,8 +18520,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18652,8 +18529,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18661,8 +18538,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18670,8 +18547,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18679,8 +18556,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3672",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18688,8 +18565,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18697,8 +18574,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18706,8 +18583,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18715,8 +18592,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18724,8 +18601,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4179",
-   "self_type" : "type-4178",
+   "referenced_type" : "type-4157",
+   "self_type" : "type-4156",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18733,8 +18610,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4302",
-   "self_type" : "type-4301",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4275",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18742,8 +18619,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18751,8 +18628,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4590",
-   "self_type" : "type-4589",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18760,8 +18637,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18769,8 +18646,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18778,8 +18655,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -18787,8 +18664,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18796,8 +18673,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18805,150 +18682,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -18956,35 +18689,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2185",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -18992,11 +18761,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -19004,7 +18881,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19012,8 +18889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19021,8 +18898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19030,8 +18907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19039,8 +18916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19048,8 +18925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19057,8 +18934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19066,8 +18943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2767",
-   "self_type" : "type-2766",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19075,8 +18952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19084,8 +18961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19093,8 +18970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3208",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19102,8 +18979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19111,8 +18988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3453",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19120,8 +18997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3621",
-   "self_type" : "type-3620",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19129,8 +19006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3671",
-   "self_type" : "type-3670",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19138,8 +19015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19147,8 +19024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19156,8 +19033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19165,8 +19042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4015",
-   "self_type" : "type-4014",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19174,8 +19051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4177",
-   "self_type" : "type-4176",
+   "referenced_type" : "type-4155",
+   "self_type" : "type-4154",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19183,8 +19060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4300",
-   "self_type" : "type-4299",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19192,8 +19069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4448",
-   "self_type" : "type-4447",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19201,8 +19078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4588",
-   "self_type" : "type-4587",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19210,8 +19087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19219,8 +19096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19228,8 +19105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19237,8 +19114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-3631",
-   "self_type" : "type-3630",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19246,8 +19123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4659",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19255,8 +19132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19264,8 +19141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19273,1995 +19150,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3418",
-   "self_type" : "type-3417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3722",
-   "self_type" : "type-3721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-4141",
-   "self_type" : "type-4140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3126",
-   "self_type" : "type-3125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3410",
-   "self_type" : "type-3409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3592",
-   "self_type" : "type-3591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3714",
-   "self_type" : "type-3713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3894",
-   "self_type" : "type-3893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4132",
-   "self_type" : "type-4131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4666",
-   "self_type" : "type-4665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3408",
-   "self_type" : "type-3407",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3712",
-   "self_type" : "type-3711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3892",
-   "self_type" : "type-3891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-4130",
-   "self_type" : "type-4129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1994",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2905",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3412",
-   "self_type" : "type-3411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3716",
-   "self_type" : "type-3715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3896",
-   "self_type" : "type-3895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-4135",
-   "self_type" : "type-4134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3406",
-   "self_type" : "type-3405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3754",
-   "self_type" : "type-3753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3964",
-   "self_type" : "type-3963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-4128",
-   "self_type" : "type-4127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3042",
-   "self_type" : "type-3041",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3389",
-   "self_type" : "type-3388",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3581",
-   "self_type" : "type-3580",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3966",
-   "self_type" : "type-3965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4107",
-   "self_type" : "type-4106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4277",
-   "self_type" : "type-4276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4414",
-   "self_type" : "type-4413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4550",
-   "self_type" : "type-4549",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2911",
-   "self_type" : "type-2910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3416",
-   "self_type" : "type-3415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3900",
-   "self_type" : "type-3899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-4139",
-   "self_type" : "type-4138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3265",
-   "self_type" : "type-3264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3390",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3575",
-   "self_type" : "type-3574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3968",
-   "self_type" : "type-3967",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4110",
-   "self_type" : "type-4109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4272",
-   "self_type" : "type-4271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4417",
-   "self_type" : "type-4416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4552",
-   "self_type" : "type-4551",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3219",
-   "self_type" : "type-3218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3316",
-   "self_type" : "type-3315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3738",
-   "self_type" : "type-3737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3942",
-   "self_type" : "type-3941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4026",
-   "self_type" : "type-4025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4196",
-   "self_type" : "type-4195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4350",
-   "self_type" : "type-4349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4456",
-   "self_type" : "type-4455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4475",
-   "self_type" : "type-4474",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4605",
-   "self_type" : "type-4604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3414",
-   "self_type" : "type-3413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3897",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-4137",
-   "self_type" : "type-4136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3396",
-   "self_type" : "type-3395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3768",
-   "self_type" : "type-3767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3890",
-   "self_type" : "type-3889",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4116",
-   "self_type" : "type-4115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3536",
-   "self_type" : "type-3535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3872",
-   "self_type" : "type-3871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3431",
-   "self_type" : "type-3430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3913",
-   "self_type" : "type-3912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4153",
-   "self_type" : "type-4152",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4269",
-   "self_type" : "type-4268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4433",
-   "self_type" : "type-4432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4569",
-   "self_type" : "type-4568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2126",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3528",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3832",
-   "self_type" : "type-3831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4250",
-   "self_type" : "type-4249",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4387",
-   "self_type" : "type-4386",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4526",
-   "self_type" : "type-4525",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4645",
-   "self_type" : "type-4644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2013",
-   "self_type" : "type-2012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3553",
-   "self_type" : "type-3552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4259",
-   "self_type" : "type-4258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4356",
-   "self_type" : "type-4355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4545",
-   "self_type" : "type-4544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4683",
-   "self_type" : "type-4682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3534",
-   "self_type" : "type-3533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3692",
-   "self_type" : "type-3691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4255",
-   "self_type" : "type-4254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4323",
-   "self_type" : "type-4322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -21269,224 +19157,89 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3108",
+   "self_type" : "type-3107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3113",
-   "self_type" : "type-3112",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3509",
-   "self_type" : "type-3508",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3551",
-   "self_type" : "type-3550",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3884",
-   "self_type" : "type-3883",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-4114",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4316",
-   "self_type" : "type-4315",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4406",
-   "self_type" : "type-4405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3102",
-   "self_type" : "type-3101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3875",
-   "self_type" : "type-3874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -21494,4949 +19247,35 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3105",
-   "self_type" : "type-3104",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3877",
-   "self_type" : "type-3876",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3957",
-   "self_type" : "type-3956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-4175",
-   "self_type" : "type-4174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3446",
-   "self_type" : "type-3445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3756",
-   "self_type" : "type-3755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4169",
-   "self_type" : "type-4168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4664",
-   "self_type" : "type-4663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2761",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3616",
-   "self_type" : "type-3615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3613",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3669",
-   "self_type" : "type-3668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3762",
-   "self_type" : "type-3761",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3758",
-   "self_type" : "type-3757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3955",
-   "self_type" : "type-3954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-4171",
-   "self_type" : "type-4170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3433",
-   "self_type" : "type-3432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3914",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4155",
-   "self_type" : "type-4154",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4285",
-   "self_type" : "type-4284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4431",
-   "self_type" : "type-4430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4567",
-   "self_type" : "type-4566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2159",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1822",
-   "self_type" : "type-1821",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3359",
-   "self_type" : "type-3358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3820",
-   "self_type" : "type-3819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4075",
-   "self_type" : "type-4074",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4240",
-   "self_type" : "type-4239",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4379",
-   "self_type" : "type-4378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4635",
-   "self_type" : "type-4634",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3022",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3346",
-   "self_type" : "type-3345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3506",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4059",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4227",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4371",
-   "self_type" : "type-4370",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4500",
-   "self_type" : "type-4499",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4625",
-   "self_type" : "type-4624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1755",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4203",
-   "self_type" : "type-4202",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4318",
-   "self_type" : "type-4317",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3429",
-   "self_type" : "type-3428",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4151",
-   "self_type" : "type-4150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4266",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4728",
-   "self_type" : "type-4727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2711",
-   "self_type" : "type-2710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3184",
-   "self_type" : "type-3183",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3540",
-   "self_type" : "type-3539",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3602",
-   "self_type" : "type-3601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3731",
-   "self_type" : "type-3730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3920",
-   "self_type" : "type-3919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3949",
-   "self_type" : "type-3948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4004",
-   "self_type" : "type-4003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4159",
-   "self_type" : "type-4158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4289",
-   "self_type" : "type-4288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4439",
-   "self_type" : "type-4438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2305",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2295",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2076",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2063",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3865",
-   "self_type" : "type-3864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-2088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2889",
-   "self_type" : "type-2888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3085",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3400",
-   "self_type" : "type-3399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3565",
-   "self_type" : "type-3564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3863",
-   "self_type" : "type-3862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4120",
-   "self_type" : "type-4119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4398",
-   "self_type" : "type-4397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4424",
-   "self_type" : "type-4423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4559",
-   "self_type" : "type-4558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4707",
-   "self_type" : "type-4706",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2503",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3398",
-   "self_type" : "type-3397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3563",
-   "self_type" : "type-3562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3858",
-   "self_type" : "type-3857",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3974",
-   "self_type" : "type-3973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4118",
-   "self_type" : "type-4117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4396",
-   "self_type" : "type-4395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4557",
-   "self_type" : "type-4556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1880",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3586",
-   "self_type" : "type-3585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3708",
-   "self_type" : "type-3707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3870",
-   "self_type" : "type-3869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3982",
-   "self_type" : "type-3981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4283",
-   "self_type" : "type-4282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4428",
-   "self_type" : "type-4427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4563",
-   "self_type" : "type-4562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3275",
-   "self_type" : "type-3274",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3402",
-   "self_type" : "type-3401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3583",
-   "self_type" : "type-3582",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3706",
-   "self_type" : "type-3705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3868",
-   "self_type" : "type-3867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3979",
-   "self_type" : "type-3978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4123",
-   "self_type" : "type-4122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4281",
-   "self_type" : "type-4280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4426",
-   "self_type" : "type-4425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3070",
-   "self_type" : "type-3069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3377",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3435",
-   "self_type" : "type-3434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3675",
-   "self_type" : "type-3674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3850",
-   "self_type" : "type-3849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4093",
-   "self_type" : "type-4092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4157",
-   "self_type" : "type-4156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4279",
-   "self_type" : "type-4278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4532",
-   "self_type" : "type-4531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4536",
-   "self_type" : "type-4535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3017",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3801",
-   "self_type" : "type-3800",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4223",
-   "self_type" : "type-4222",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4365",
-   "self_type" : "type-4364",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4495",
-   "self_type" : "type-4494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4623",
-   "self_type" : "type-4622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3354",
-   "self_type" : "type-3353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3815",
-   "self_type" : "type-3814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4069",
-   "self_type" : "type-4068",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4235",
-   "self_type" : "type-4234",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4377",
-   "self_type" : "type-4376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4509",
-   "self_type" : "type-4508",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4630",
-   "self_type" : "type-4629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3141",
-   "self_type" : "type-3140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3470",
-   "self_type" : "type-3469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3567",
-   "self_type" : "type-3566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4192",
-   "self_type" : "type-4191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4261",
-   "self_type" : "type-4260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4435",
-   "self_type" : "type-4434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4571",
-   "self_type" : "type-4570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4712",
-   "self_type" : "type-4711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3145",
-   "self_type" : "type-3144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3427",
-   "self_type" : "type-3426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3909",
-   "self_type" : "type-3908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3996",
-   "self_type" : "type-3995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4149",
-   "self_type" : "type-4148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4265",
-   "self_type" : "type-4264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4437",
-   "self_type" : "type-4436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1823",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3046",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3364",
-   "self_type" : "type-3363",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3524",
-   "self_type" : "type-3523",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3827",
-   "self_type" : "type-3826",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4245",
-   "self_type" : "type-4244",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4381",
-   "self_type" : "type-4380",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4520",
-   "self_type" : "type-4519",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4640",
-   "self_type" : "type-4639",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1740",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2916",
-   "self_type" : "type-2915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3279",
-   "self_type" : "type-3278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3686",
-   "self_type" : "type-3685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3724",
-   "self_type" : "type-3723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3879",
-   "self_type" : "type-3878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4181",
-   "self_type" : "type-4180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4298",
-   "self_type" : "type-4297",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4308",
-   "self_type" : "type-4307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4402",
-   "self_type" : "type-4401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4543",
-   "self_type" : "type-4542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1854",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2036",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3109",
-   "self_type" : "type-3108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3690",
-   "self_type" : "type-3689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3727",
-   "self_type" : "type-3726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4187",
-   "self_type" : "type-4186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4311",
-   "self_type" : "type-4310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4404",
-   "self_type" : "type-4403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4565",
-   "self_type" : "type-4564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4647",
-   "self_type" : "type-4646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3425",
-   "self_type" : "type-3424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3994",
-   "self_type" : "type-3993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4147",
-   "self_type" : "type-4146",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4263",
-   "self_type" : "type-4262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4409",
-   "self_type" : "type-4408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4717",
-   "self_type" : "type-4716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3998",
-   "self_type" : "type-3997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3007",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4044",
-   "self_type" : "type-4043",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4213",
-   "self_type" : "type-4212",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4361",
-   "self_type" : "type-4360",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4483",
-   "self_type" : "type-4482",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4613",
-   "self_type" : "type-4612",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-1759",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-4185",
-   "self_type" : "type-4184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-4143",
-   "self_type" : "type-4142",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-1930",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1999",
-   "self_type" : "type-1998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3159",
-   "self_type" : "type-3158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3383",
-   "self_type" : "type-3382",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3444",
-   "self_type" : "type-3443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3681",
-   "self_type" : "type-3680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3772",
-   "self_type" : "type-3771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3959",
-   "self_type" : "type-3958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4534",
-   "self_type" : "type-4533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4539",
-   "self_type" : "type-4538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1848",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3385",
-   "self_type" : "type-3384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3450",
-   "self_type" : "type-3449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3684",
-   "self_type" : "type-3683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3856",
-   "self_type" : "type-3855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4102",
-   "self_type" : "type-4101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4173",
-   "self_type" : "type-4172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4400",
-   "self_type" : "type-4399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4541",
-   "self_type" : "type-4540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-3387",
    "self_type" : "type-3386",
    "size" : 4,
@@ -26444,296 +19283,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3558",
-   "self_type" : "type-3557",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4104",
-   "self_type" : "type-4103",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4145",
-   "self_type" : "type-4144",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4394",
-   "self_type" : "type-4393",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4412",
-   "self_type" : "type-4411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4548",
-   "self_type" : "type-4547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1842",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3012",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3336",
-   "self_type" : "type-3335",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3497",
-   "self_type" : "type-3496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4049",
-   "self_type" : "type-4048",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4217",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4363",
-   "self_type" : "type-4362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4489",
-   "self_type" : "type-4488",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4618",
-   "self_type" : "type-4617",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -26741,10 +19346,7282 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3097",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3385",
+   "self_type" : "type-3384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-4104",
+   "self_type" : "type-4103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-4108",
+   "self_type" : "type-4107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3934",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-4102",
+   "self_type" : "type-4101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3366",
+   "self_type" : "type-3365",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4390",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4174",
+   "self_type" : "type-4173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4324",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-4110",
+   "self_type" : "type-4109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2953",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3095",
+   "self_type" : "type-3094",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4128",
+   "self_type" : "type-4127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4226",
+   "self_type" : "type-4225",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4361",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4235",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4520",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3085",
+   "self_type" : "type-3084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4381",
+   "self_type" : "type-4380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-4149",
+   "self_type" : "type-4148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3958",
+   "self_type" : "type-3957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4352",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4032",
+   "self_type" : "type-4031",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4204",
+   "self_type" : "type-4203",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4342",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2907",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3414",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3703",
+   "self_type" : "type-3702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4137",
+   "self_type" : "type-4136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2864",
+   "self_type" : "type-2863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3945",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4397",
+   "self_type" : "type-4396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3944",
+   "self_type" : "type-3943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4370",
+   "self_type" : "type-4369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4258",
+   "self_type" : "type-4257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3948",
+   "self_type" : "type-3947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4400",
+   "self_type" : "type-4399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4135",
+   "self_type" : "type-4134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4506",
+   "self_type" : "type-4505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2990",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4027",
+   "self_type" : "type-4026",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4199",
+   "self_type" : "type-4198",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4469",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1941",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4484",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3260",
+   "self_type" : "type-3259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4170",
+   "self_type" : "type-4169",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4546",
+   "self_type" : "type-4545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4686",
+   "self_type" : "type-4685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4241",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4355",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4494",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4284",
+   "self_type" : "type-4283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4376",
+   "self_type" : "type-4375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1719",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4586",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-1730",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-4163",
+   "self_type" : "type-4162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4115",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-1901",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2785",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3930",
+   "self_type" : "type-3929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4513",
+   "self_type" : "type-4512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3362",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3426",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4075",
+   "self_type" : "type-4074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4151",
+   "self_type" : "type-4150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4374",
+   "self_type" : "type-4373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4119",
+   "self_type" : "type-4118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4022",
+   "self_type" : "type-4021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4194",
+   "self_type" : "type-4193",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4335",
+   "self_type" : "type-4334",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26752,8 +26629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26761,8 +26638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26770,8 +26647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26779,8 +26656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26788,96 +26665,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -26885,10 +26672,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26896,8 +26773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26905,8 +26782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26914,8 +26791,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-2508",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26923,8 +26800,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-2501",
-   "self_type" : "type-2505",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26932,8 +26809,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26941,8 +26818,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26950,8 +26827,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26959,8 +26836,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26968,8 +26845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-2502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26977,8 +26854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26986,8 +26863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26995,8 +26872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-938",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27004,8 +26881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27013,8 +26890,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27022,8 +26899,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27031,8 +26908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27049,8 +26926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27058,8 +26935,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27067,8 +26944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -27076,8 +26953,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27085,8 +26962,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27094,8 +26971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2210",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -27103,8 +26980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27112,8 +26989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -27121,8 +26998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -27130,8 +27007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -27139,8 +27016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -27148,8 +27025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -27157,8 +27034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27166,8 +27043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27175,8 +27052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27184,8 +27061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27193,8 +27070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27202,8 +27079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -27211,8 +27088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27220,8 +27097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3060",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27229,8 +27106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3838",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-3809",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27238,8 +27115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27247,8 +27124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27256,8 +27133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27265,8 +27142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27274,8 +27151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27283,8 +27160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27292,8 +27169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2640",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27301,8 +27178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3066",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27310,8 +27187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27319,8 +27196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3394",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27328,8 +27205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3576",
-   "self_type" : "type-3579",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27337,8 +27214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3845",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3970",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27355,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4111",
-   "self_type" : "type-4113",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27364,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-44",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27373,8 +27250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4273",
-   "self_type" : "type-4275",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27382,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4418",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27391,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4555",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27400,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemory *",
    "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27409,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemoryHeap *",
    "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -27418,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27427,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3554",
-   "self_type" : "type-3556",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27445,8 +27322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27454,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27463,8 +27340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27472,8 +27349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27481,8 +27358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27490,8 +27367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27499,8 +27376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27508,8 +27385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27517,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27526,26 +27403,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2204",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2199",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27553,8 +27430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27562,8 +27439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27571,8 +27448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27580,8 +27457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27589,8 +27466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27598,8 +27475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27607,8 +27484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27616,8 +27493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27625,8 +27502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27634,8 +27511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27643,8 +27520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27652,8 +27529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27661,8 +27538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27670,8 +27547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27679,8 +27556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27688,8 +27565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27697,8 +27574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2054",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27706,8 +27583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27715,8 +27592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27724,8 +27601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3199",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27733,8 +27610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27742,8 +27619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3302",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27751,8 +27628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27760,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3605",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27769,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27778,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3925",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27787,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4009",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27796,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4162",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27805,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4293",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27814,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4441",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27823,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4582",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27832,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27841,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27850,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27859,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27868,8 +27745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27877,8 +27754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27886,8 +27763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27895,8 +27772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27904,8 +27781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27913,8 +27790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27922,8 +27799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27931,8 +27808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27940,8 +27817,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27949,8 +27826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27958,8 +27835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27967,8 +27844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27976,8 +27853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27985,8 +27862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27994,8 +27871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28003,8 +27880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28012,8 +27889,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -28021,8 +27898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2243",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -28030,8 +27907,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28039,8 +27916,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-3082",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28048,8 +27925,35 @@
    "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-3859",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3968",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28057,8 +27961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28066,8 +27970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3443",
+   "self_type" : "type-3445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28075,8 +27979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4188",
-   "self_type" : "type-4190",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28084,8 +27988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28093,8 +27997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28102,8 +28006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3852",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28111,8 +28015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28120,8 +28024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3559",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28129,8 +28033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28138,8 +28042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28147,8 +28051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28156,8 +28060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28165,8 +28069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28174,8 +28078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28183,8 +28087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28192,8 +28096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28201,8 +28105,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28210,8 +28114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28219,8 +28123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28228,8 +28132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28237,8 +28141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28246,141 +28150,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
-   "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXNode> *",
-   "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
-   "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
-   "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::NativeHandle> *",
-   "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "referenced_type" : "type-2521",
    "self_type" : "type-2523",
    "size" : 4,
@@ -28388,10 +28157,145 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
+   "name" : "const android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXNode> *",
+   "name" : "const android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
+   "name" : "const android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
+   "name" : "const android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28399,8 +28303,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28408,8 +28312,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28417,8 +28321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-937",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28426,8 +28330,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28435,8 +28339,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28444,8 +28348,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-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28453,8 +28357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28462,8 +28366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28471,8 +28375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28480,26 +28384,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28507,8 +28402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28516,8 +28411,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28525,8 +28420,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28534,8 +28429,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28543,8 +28438,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28552,8 +28447,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-1923",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28561,8 +28456,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-3210",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3187",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28570,8 +28465,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-3321",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-3298",
+   "self_type" : "type-3300",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28579,8 +28474,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-3934",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3908",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28588,8 +28483,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-4032",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28597,8 +28492,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-4461",
-   "self_type" : "type-4463",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28606,8 +28501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28615,8 +28510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28624,8 +28519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28633,8 +28528,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28642,8 +28537,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -28651,8 +28546,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28660,8 +28555,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28669,8 +28564,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28678,8 +28573,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28687,8 +28582,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -28697,7 +28592,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -28706,7 +28601,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28714,8 +28609,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28723,8 +28618,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28732,8 +28627,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -28741,8 +28636,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -28754,8 +28649,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28764,8 +28659,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28774,8 +28669,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -28784,8 +28679,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28794,8 +28689,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28804,8 +28699,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28814,8 +28709,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28824,8 +28719,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28834,8 +28729,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28844,8 +28739,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1898",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28854,8 +28749,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28864,8 +28759,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28874,8 +28769,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28884,8 +28779,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28894,8 +28789,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28904,8 +28799,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2931",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-3155",
+   "self_type" : "type-3159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28914,8 +28809,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28924,8 +28819,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3298",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28934,8 +28829,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3436",
-   "self_type" : "type-3438",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28944,8 +28839,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28954,8 +28849,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3603",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28964,8 +28859,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3661",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28974,8 +28869,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3730",
-   "self_type" : "type-3733",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28984,8 +28879,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3919",
-   "self_type" : "type-3921",
+   "referenced_type" : "type-3925",
+   "self_type" : "type-3924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28994,8 +28889,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-3947",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29004,8 +28899,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4003",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4136",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29014,8 +28909,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4158",
-   "self_type" : "type-4160",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29024,8 +28919,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4288",
-   "self_type" : "type-4290",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29034,8 +28929,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4438",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29044,8 +28939,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4577",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29054,8 +28949,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29064,8 +28959,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29074,8 +28969,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2183",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -29084,8 +28979,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29094,8 +28989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2314",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -29104,8 +28999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -29114,8 +29009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-69",
+   "self_type" : "type-2442",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -29124,8 +29019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29134,8 +29029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2188",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29144,8 +29039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29154,8 +29049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29164,8 +29059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29174,8 +29069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29184,8 +29079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1875",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29194,8 +29089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -29204,8 +29099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29214,8 +29109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29224,8 +29119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29234,8 +29129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29244,8 +29139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3058",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29254,8 +29149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3810",
+   "self_type" : "type-3809",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29264,8 +29159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29284,8 +29179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29294,8 +29189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29304,8 +29199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29314,8 +29209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29324,8 +29219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29334,8 +29229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2617",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29344,8 +29239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29354,8 +29249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3393",
-   "self_type" : "type-3392",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29374,8 +29269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3846",
-   "self_type" : "type-3845",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29384,8 +29279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3817",
+   "self_type" : "type-3816",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29394,8 +29289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4111",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29404,8 +29299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4274",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29414,8 +29309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29424,8 +29319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29434,8 +29329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4554",
-   "self_type" : "type-4553",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29444,8 +29339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29454,8 +29349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -29464,8 +29359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29474,8 +29369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29484,8 +29379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29494,8 +29389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29504,8 +29399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29514,8 +29409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29524,8 +29419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29534,8 +29429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3366",
-   "self_type" : "type-3365",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29544,8 +29439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3526",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29554,8 +29449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3829",
-   "self_type" : "type-3828",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29564,8 +29459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4082",
-   "self_type" : "type-4081",
+   "referenced_type" : "type-4054",
+   "self_type" : "type-4053",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29574,8 +29469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4246",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29584,8 +29479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4384",
-   "self_type" : "type-4383",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29594,8 +29489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4496",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29604,8 +29499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29614,8 +29509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-2486",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2461",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29624,8 +29519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3555",
-   "self_type" : "type-3554",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4664",
+   "self_type" : "type-4663",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29644,8 +29539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29654,8 +29549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29664,8 +29559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2167",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29674,8 +29569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29684,8 +29579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29694,8 +29589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29704,8 +29599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29714,8 +29609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29724,8 +29619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -29734,29 +29629,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2198",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2172",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -29764,8 +29659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29774,8 +29669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29784,8 +29679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29794,8 +29689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29804,8 +29699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29814,8 +29709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29824,8 +29719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -29834,8 +29729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29844,8 +29739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29854,8 +29749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29864,18 +29759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1731",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29884,8 +29769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29894,8 +29779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29904,8 +29789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2799",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29914,8 +29799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3035",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29924,8 +29809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29934,8 +29819,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29944,8 +29829,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29954,8 +29839,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3817",
-   "self_type" : "type-3816",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29964,8 +29849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4072",
-   "self_type" : "type-4071",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29974,8 +29859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4237",
-   "self_type" : "type-4236",
+   "referenced_type" : "type-4211",
+   "self_type" : "type-4210",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29984,8 +29869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4325",
-   "self_type" : "type-4324",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29994,8 +29879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30004,8 +29889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4606",
+   "self_type" : "type-4605",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30014,18 +29899,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30034,8 +29929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30044,8 +29939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30054,8 +29949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30064,18 +29959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30084,8 +29969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30094,8 +29979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30104,8 +29989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30114,8 +29999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3802",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30124,8 +30009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4057",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4029",
+   "self_type" : "type-4028",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30134,8 +30019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4201",
+   "self_type" : "type-4200",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30144,8 +30029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4368",
-   "self_type" : "type-4367",
+   "referenced_type" : "type-4340",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30154,8 +30039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4497",
-   "self_type" : "type-4496",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30164,18 +30049,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2169",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-2536",
+   "referenced_type" : "type-825",
+   "self_type" : "type-2512",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30184,8 +30089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30194,8 +30099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30204,8 +30109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30214,8 +30119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30224,8 +30129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -30234,8 +30139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30244,8 +30149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30254,8 +30159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30264,8 +30169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30274,8 +30179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30284,8 +30189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30294,8 +30199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2744",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30304,8 +30209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30314,8 +30219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30324,8 +30229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30334,8 +30239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3304",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30344,8 +30249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3440",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30354,8 +30259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3607",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30364,8 +30269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3748",
-   "self_type" : "type-3747",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30374,8 +30279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3927",
-   "self_type" : "type-3926",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3897",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30384,8 +30289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30394,8 +30299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4164",
-   "self_type" : "type-4163",
+   "referenced_type" : "type-4141",
+   "self_type" : "type-4140",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30404,8 +30309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30414,8 +30319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4443",
-   "self_type" : "type-4442",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30424,8 +30329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4584",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30434,8 +30339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30444,8 +30349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30454,8 +30359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30464,8 +30369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30474,8 +30379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30484,8 +30389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30494,8 +30399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2053",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30504,8 +30409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30514,8 +30419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2040",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30524,8 +30429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30534,8 +30439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30544,8 +30449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30554,8 +30459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30564,8 +30469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30574,8 +30479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30584,8 +30489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30594,8 +30499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30604,8 +30509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30614,8 +30519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-272",
+   "self_type" : "type-2024",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30624,8 +30529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30634,8 +30539,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30644,8 +30549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2239",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -30654,8 +30559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30664,8 +30569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30674,8 +30579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30684,8 +30589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30694,8 +30599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30704,8 +30609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30714,8 +30619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3305",
+   "self_type" : "type-3304",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30724,8 +30629,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30734,8 +30639,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3758",
+   "self_type" : "type-3757",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30744,8 +30649,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4039",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30754,8 +30659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4210",
-   "self_type" : "type-4209",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30764,8 +30669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4358",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4330",
+   "self_type" : "type-4329",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30774,8 +30679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4480",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30784,8 +30689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4610",
-   "self_type" : "type-4609",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30794,8 +30699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30804,8 +30709,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30814,8 +30719,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-3083",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30824,8 +30729,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-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30834,8 +30739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30844,8 +30749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30854,18 +30759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1748",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -30874,8 +30769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30884,8 +30779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30894,8 +30789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30904,8 +30799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30914,8 +30809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3511",
-   "self_type" : "type-3510",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30924,118 +30819,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3809",
-   "self_type" : "type-3808",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4063",
-   "self_type" : "type-4062",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4232",
-   "self_type" : "type-4231",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4338",
-   "self_type" : "type-4337",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2995",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-3380",
-   "self_type" : "type-3379",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-3779",
    "self_type" : "type-3778",
    "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4034",
+   "self_type" : "type-4033",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4206",
+   "self_type" : "type-4205",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4311",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4573",
+   "self_type" : "type-4572",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4096",
-   "self_type" : "type-4095",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -31044,8 +30899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4341",
-   "self_type" : "type-4340",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1751",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31054,8 +30909,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3750",
+   "self_type" : "type-3749",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4314",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -31064,8 +30969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31074,8 +30979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-4469",
-   "self_type" : "type-4468",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31084,8 +30989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31094,8 +30999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-4331",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31104,8 +31009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31114,8 +31019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31124,8 +31029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31134,8 +31039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31144,8 +31049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31154,8 +31059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31164,8 +31069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31174,478 +31079,448 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3361",
-   "self_type" : "type-3360",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3520",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3824",
-   "self_type" : "type-3823",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4076",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4241",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4335",
-   "self_type" : "type-4334",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4517",
-   "self_type" : "type-4516",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4637",
-   "self_type" : "type-4636",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3030",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3351",
-   "self_type" : "type-3350",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3477",
-   "self_type" : "type-3476",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3812",
-   "self_type" : "type-3811",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4198",
-   "self_type" : "type-4197",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4373",
-   "self_type" : "type-4372",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4506",
-   "self_type" : "type-4505",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4627",
-   "self_type" : "type-4626",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3370",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3834",
-   "self_type" : "type-3833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4252",
-   "self_type" : "type-4251",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4389",
-   "self_type" : "type-4388",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4528",
-   "self_type" : "type-4527",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4649",
-   "self_type" : "type-4648",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-4189",
-   "self_type" : "type-4188",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3014",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
    "referenced_type" : "type-3338",
    "self_type" : "type-3337",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4049",
+   "self_type" : "type-4048",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4217",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3002",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4037",
+   "self_type" : "type-4036",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4347",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4481",
+   "self_type" : "type-4480",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3505",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4362",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3443",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-4167",
+   "self_type" : "type-4166",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31654,8 +31529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3498",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31664,38 +31539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3797",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4052",
-   "self_type" : "type-4051",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4220",
-   "self_type" : "type-4219",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4344",
-   "self_type" : "type-4343",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1755",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31704,8 +31549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4491",
-   "self_type" : "type-4490",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31714,8 +31559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4620",
-   "self_type" : "type-4619",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31724,8 +31569,98 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2987",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4024",
+   "self_type" : "type-4023",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4196",
+   "self_type" : "type-4195",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4317",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4467",
+   "self_type" : "type-4466",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4594",
+   "self_type" : "type-4593",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31734,8 +31669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31744,8 +31679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31754,8 +31689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31764,8 +31699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31774,8 +31709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31784,8 +31719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31794,8 +31729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3301",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31804,8 +31739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31814,8 +31749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3784",
-   "self_type" : "type-3783",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31824,8 +31759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4037",
-   "self_type" : "type-4036",
+   "referenced_type" : "type-4010",
+   "self_type" : "type-4009",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31834,8 +31769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31844,8 +31779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4352",
-   "self_type" : "type-4351",
+   "referenced_type" : "type-4327",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31854,8 +31789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4476",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31864,8 +31799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4607",
-   "self_type" : "type-4606",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31874,8 +31809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31884,8 +31819,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31894,8 +31829,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-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3047",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31904,8 +31839,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31914,8 +31849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31924,8 +31859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31934,8 +31869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4698",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31944,8 +31879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31954,8 +31889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1795",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31964,8 +31899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31974,8 +31909,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1777",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31984,8 +31919,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31994,8 +31929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32004,8 +31939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32014,8 +31949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32024,8 +31959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32034,8 +31969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32044,8 +31979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1735",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32054,8 +31989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32064,8 +31999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32074,8 +32009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32084,8 +32019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2982",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32094,8 +32029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32104,8 +32039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32114,8 +32049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3648",
-   "self_type" : "type-3647",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32124,8 +32059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32134,8 +32069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4045",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32144,8 +32079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4215",
-   "self_type" : "type-4214",
+   "referenced_type" : "type-4191",
+   "self_type" : "type-4190",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32154,8 +32089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4327",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32164,8 +32099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32174,8 +32109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4589",
+   "self_type" : "type-4588",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32184,8 +32119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32194,8 +32129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32203,24 +32138,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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-3699",
-   "self_type" : "type-3698",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3669",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32228,18 +32155,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2305",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32248,8 +32183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32258,8 +32193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32268,8 +32203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32278,8 +32213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32288,8 +32223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32298,8 +32233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32308,8 +32243,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32318,8 +32253,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32328,8 +32263,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32338,8 +32273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32348,8 +32283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32358,8 +32293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32368,8 +32303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32378,8 +32313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32388,8 +32323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32398,8 +32333,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-2508",
-   "self_type" : "type-2514",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32408,8 +32343,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-2501",
-   "self_type" : "type-2506",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32418,8 +32353,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32428,8 +32363,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32438,8 +32373,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32448,8 +32383,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32458,8 +32393,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32468,8 +32403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32478,8 +32413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32488,8 +32423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32498,8 +32433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32508,8 +32443,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32518,8 +32453,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-566",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32528,8 +32463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32538,8 +32473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32548,8 +32483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32558,8 +32493,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32568,8 +32503,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -32578,28 +32513,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2191",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -32608,8 +32533,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32618,8 +32543,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32628,8 +32553,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32638,8 +32563,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -32648,8 +32573,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32658,8 +32583,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2297",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -32668,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1883",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32678,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32688,8 +32613,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32698,8 +32623,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32708,8 +32633,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-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32718,8 +32643,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-3211",
-   "self_type" : "type-3210",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32728,8 +32653,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-3322",
-   "self_type" : "type-3321",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32738,8 +32663,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-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32748,8 +32673,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-4033",
-   "self_type" : "type-4032",
+   "referenced_type" : "type-4007",
+   "self_type" : "type-4006",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32758,8 +32683,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-4462",
-   "self_type" : "type-4461",
+   "referenced_type" : "type-4436",
+   "self_type" : "type-4435",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32768,8 +32693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-1927",
-   "self_type" : "type-1926",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32778,8 +32703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-4465",
-   "self_type" : "type-4464",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32788,8 +32713,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32798,8 +32723,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32808,8 +32733,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-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32818,8 +32743,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-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32828,8 +32753,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-3318",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32838,8 +32763,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-3924",
-   "self_type" : "type-3923",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32848,8 +32773,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-4029",
-   "self_type" : "type-4028",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4001",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32858,18 +32783,48 @@
    "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-4458",
-   "self_type" : "type-4457",
+   "referenced_type" : "type-4432",
+   "self_type" : "type-4431",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3351",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32879,7 +32834,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32888,8 +32843,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32898,8 +32853,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1888",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32907,8 +32862,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -32916,8 +32871,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -32945,13 +32900,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2101",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -32977,18 +32932,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2141",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -33019,18 +32974,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2152",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -33061,23 +33016,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -33103,17 +33058,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -33123,13 +33078,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -33155,13 +33110,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2234"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -33187,28 +33142,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -33234,13 +33189,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -33266,17 +33221,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -33296,12 +33251,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -33326,8 +33281,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1686",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -33358,13 +33313,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -33400,13 +33355,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "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_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -33457,8 +33412,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -33489,12 +33444,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -33504,8 +33459,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -33531,7 +33486,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -33546,7 +33501,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -33561,13 +33516,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1784"
+     "referenced_type" : "type-1765"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -33593,13 +33548,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2141",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -33625,13 +33580,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -33657,47 +33612,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -33712,13 +33667,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2230",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -33744,12 +33699,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2197"
     },
     {
      "field_name" : "nStereoWidening",
@@ -33759,8 +33714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -33786,18 +33741,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -33823,18 +33778,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2010",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -33895,23 +33850,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2230"
+     "referenced_type" : "type-2205"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2229"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -33952,8 +33907,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -33989,23 +33944,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2251"
+     "referenced_type" : "type-2226"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2252"
+     "referenced_type" : "type-2227"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2225"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -34036,12 +33991,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34056,23 +34011,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -34113,8 +34068,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -34145,28 +34100,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2243"
+     "referenced_type" : "type-2218"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -34197,13 +34152,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2245"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -34234,18 +34189,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -34271,18 +34226,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -34308,18 +34263,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -34345,18 +34300,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -34392,23 +34347,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -34439,23 +34394,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -34501,18 +34456,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2227"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -34543,17 +34498,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -34568,18 +34523,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2196"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2200"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -34610,18 +34565,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -34652,18 +34607,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -34694,18 +34649,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -34736,13 +34691,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -34773,7 +34728,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34788,8 +34743,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -34825,7 +34780,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34840,8 +34795,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -34902,13 +34857,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -34964,23 +34919,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2240"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -35011,12 +34966,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -35031,23 +34986,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -35078,18 +35033,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -35120,18 +35075,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -35187,23 +35142,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -35229,7 +35184,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -35239,12 +35194,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2234"
+     "referenced_type" : "type-2210"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2211"
     },
     {
      "field_name" : "nSamplingRate",
@@ -35254,12 +35209,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -35269,8 +35224,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -35281,28 +35236,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -35313,23 +35268,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -35355,8 +35310,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -35377,7 +35332,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -35397,32 +35352,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -35432,7 +35387,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -35452,8 +35407,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -35464,23 +35419,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -35491,18 +35446,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -35523,108 +35478,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -35650,12 +35605,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -35670,13 +35625,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2275"
+     "referenced_type" : "type-2250"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -35687,27 +35642,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2273"
+     "referenced_type" : "type-2248"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -35718,23 +35673,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -35770,8 +35725,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2492",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -35792,13 +35747,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -35829,8 +35784,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -35856,12 +35811,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -35871,8 +35826,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -35903,13 +35858,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2339"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -35935,18 +35890,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2283"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2264"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -35972,7 +35927,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -35987,8 +35942,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -36024,8 +35979,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -36046,7 +36001,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36061,8 +36016,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -36083,7 +36038,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36103,18 +36058,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -36140,13 +36095,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -36172,13 +36127,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -36204,13 +36159,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -36236,12 +36191,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -36251,7 +36206,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -36261,7 +36216,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -36271,13 +36226,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -36303,53 +36258,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -36380,8 +36335,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -36407,13 +36362,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2394",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -36439,13 +36394,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2480",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -36471,13 +36426,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2292"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -36503,13 +36458,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -36535,13 +36490,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -36572,13 +36527,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -36604,13 +36559,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -36631,7 +36586,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36646,8 +36601,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -36668,7 +36623,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36683,12 +36638,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -36698,17 +36653,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -36723,13 +36678,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -36755,13 +36710,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2355"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -36797,8 +36752,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -36824,18 +36779,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -36861,12 +36816,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -36881,8 +36836,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -36908,13 +36863,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -36940,13 +36895,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2512",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2490",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -36972,18 +36927,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -37009,13 +36964,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2530"
+     "referenced_type" : "type-2506"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2507",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -37041,13 +36996,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2407"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -37083,8 +37038,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -37110,7 +37065,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -37125,8 +37080,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -37152,13 +37107,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -37184,23 +37139,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -37231,18 +37186,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -37273,8 +37228,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -37300,18 +37255,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -37322,12 +37277,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -37342,7 +37297,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -37352,28 +37307,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -37384,18 +37339,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -37421,13 +37376,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -37448,13 +37403,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -37475,8 +37430,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -37502,7 +37457,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2164"
+     "referenced_type" : "type-2136"
     },
     {
      "field_name" : "nDataSize",
@@ -37512,13 +37467,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -37549,13 +37504,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -37566,13 +37521,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -37598,13 +37553,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -37625,13 +37580,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -37652,13 +37607,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -37679,13 +37634,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -37748,13 +37703,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -37780,58 +37735,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -37857,7 +37812,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -37867,8 +37822,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -37899,8 +37854,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -37921,12 +37876,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -37936,7 +37891,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -37946,18 +37901,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -37983,7 +37938,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -38003,27 +37958,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -38033,8 +37988,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -38045,27 +38000,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -38096,18 +38051,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2342"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -38128,13 +38083,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -38155,13 +38110,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -38192,8 +38147,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -38224,8 +38179,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -38256,8 +38211,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -38278,13 +38233,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -38305,13 +38260,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -38332,17 +38287,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -38352,8 +38307,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -38379,23 +38334,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -38416,13 +38371,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -38443,13 +38398,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -38475,13 +38430,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -38507,38 +38462,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -38554,13 +38509,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -38646,8 +38601,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -38673,7 +38628,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38688,18 +38643,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38735,8 +38690,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -38767,8 +38722,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -38799,8 +38754,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -38826,7 +38781,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -38851,8 +38806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -38878,7 +38833,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -38893,7 +38848,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38908,18 +38863,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38950,7 +38905,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -38960,7 +38915,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -38975,8 +38930,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -39012,13 +38967,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -39059,7 +39014,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -39079,32 +39034,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39114,22 +39069,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -39139,17 +39094,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -39159,13 +39114,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -39191,17 +39146,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -39223,8 +39178,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -39250,12 +39205,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -39265,12 +39220,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -39312,17 +39267,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39332,7 +39287,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -39347,8 +39302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -39374,12 +39329,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -39389,8 +39344,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -39416,7 +39371,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -39436,8 +39391,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -39463,33 +39418,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -39525,7 +39480,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -39535,8 +39490,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -39567,12 +39522,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -39592,7 +39547,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -39607,12 +39562,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39627,13 +39582,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -39664,12 +39619,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -39679,8 +39634,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -39721,8 +39676,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -39763,8 +39718,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -39790,22 +39745,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -39830,23 +39785,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -39872,43 +39827,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -39934,7 +39889,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -39954,8 +39909,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -39981,12 +39936,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -39996,13 +39951,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -40028,17 +39983,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -40053,13 +40008,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -40085,13 +40040,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -40102,12 +40057,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -40122,7 +40077,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -40142,28 +40097,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -40174,18 +40129,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -40211,18 +40166,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -40248,18 +40203,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -40285,38 +40240,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -40326,7 +40281,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40335,13 +40290,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -40365,19 +40320,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -40416,8 +40371,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-2465",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "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"
@@ -40426,8 +40381,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -40437,7 +40392,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40446,19 +40401,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -40470,13 +40425,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -40520,7 +40475,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40529,55 +40484,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -40619,18 +40574,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -40640,7 +40595,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40655,25 +40610,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -40684,8 +40639,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -40727,12 +40682,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -40742,13 +40697,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -40759,11 +40714,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -40771,35 +40726,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -40810,28 +40765,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -40841,7 +40796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40850,25 +40805,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -40910,7 +40865,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -40927,8 +40882,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -40938,7 +40893,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -40947,20 +40902,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -41081,20 +41036,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -41289,20 +41244,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -41530,20 +41485,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -41795,20 +41750,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -42000,20 +41955,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2258"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2258" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -42165,20 +42120,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2278"
+     "referenced_type" : "type-2252"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2278" ],
+   "template_args" : [ "type-2252" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -42346,20 +42301,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -42527,20 +42482,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -42763,20 +42718,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -42928,20 +42883,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -43123,14 +43078,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2287"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -43287,14 +43242,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2281"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -43468,7 +43423,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43477,26 +43432,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -43585,28 +43540,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -43615,8 +43570,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -43625,8 +43580,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -43638,14 +43593,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -43671,7 +43626,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -43681,13 +43636,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -43713,12 +43668,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -43733,13 +43688,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -43760,7 +43715,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43785,18 +43740,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -43817,7 +43772,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43842,18 +43797,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -43889,13 +43844,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -43921,13 +43876,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2287"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -43953,13 +43908,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -43969,11 +43924,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -43981,11 +43936,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -43993,11 +43948,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -44005,11 +43960,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -44017,11 +43972,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -44029,11 +43984,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -44041,11 +43996,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -44053,11 +44008,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -44065,8 +44020,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -44097,8 +44052,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -44109,17 +44064,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2313"
+     "referenced_type" : "type-2288"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2289"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -44130,15 +44085,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2290"
     }
    ],
    "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-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -44149,18 +44104,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -44171,48 +44126,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -44223,14 +44178,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -44359,14 +44314,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -44447,14 +44402,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -44534,14 +44489,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -44628,14 +44583,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -44738,13 +44693,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -44794,17 +44749,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -44814,17 +44769,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44834,17 +44789,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -44854,17 +44809,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44874,17 +44829,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -44894,17 +44849,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -44914,17 +44869,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -44934,17 +44889,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -44954,17 +44909,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -44974,14 +44929,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44992,11 +44947,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -45004,11 +44959,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -45016,11 +44971,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -45028,11 +44983,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -45040,17 +44995,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -45058,17 +45013,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -45078,17 +45033,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -45098,17 +45053,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -45118,29 +45073,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2179" ],
+   "template_args" : [ "type-2151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -45148,18 +45103,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -45169,50 +45124,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -45221,17 +45176,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -45240,17 +45195,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -45261,26 +45216,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -45293,26 +45248,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -45325,17 +45280,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -45364,17 +45319,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -45403,17 +45358,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -45442,18 +45397,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -45461,15 +45416,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -45481,17 +45436,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -45520,17 +45475,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -45557,100 +45512,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -45660,7 +45531,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -45670,29 +45541,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -45702,18 +45583,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -45724,23 +45605,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -45751,7 +45632,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45776,13 +45657,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -45793,7 +45674,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45823,13 +45704,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -45845,12 +45726,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -45865,8 +45746,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -45902,8 +45783,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -45915,14 +45796,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -45934,14 +45815,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2162"
+     "referenced_type" : "type-2134"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -45951,7 +45832,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -45960,20 +45841,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -45983,7 +45864,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -45992,44 +45873,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -46064,11 +45939,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -46077,61 +45975,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46143,25 +46041,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -46173,127 +46071,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -46518,8 +46416,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -46528,8 +46426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -46573,14 +46471,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -46622,13 +46520,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -46652,7 +46550,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -46676,13 +46574,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46694,31 +46592,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -46730,8 +46628,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -46744,13 +46642,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -46762,14 +46660,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -46780,8 +46678,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -46817,14 +46715,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -46834,14 +46732,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -46851,8 +46749,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -46904,7 +46802,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -46919,8 +46817,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -46941,13 +46839,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -46959,14 +46857,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2140"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -46978,14 +46876,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -46997,14 +46895,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -47017,14 +46915,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -47064,8 +46962,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -47075,8 +46973,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -47086,8 +46984,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -47111,7 +47009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -47120,17 +47018,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2304" ],
+   "template_args" : [ "type-2280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -47325,7 +47223,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -47334,17 +47232,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2301" ],
+   "template_args" : [ "type-2277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -47574,14 +47472,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -47591,11 +47489,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2289" ],
+   "template_args" : [ "type-2260" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -47603,13 +47501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -47650,17 +47548,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -47708,17 +47606,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -47766,17 +47664,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -47824,17 +47722,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47882,17 +47780,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -47940,17 +47838,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47998,17 +47896,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -48056,17 +47954,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48114,17 +48012,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48172,17 +48070,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -48230,17 +48128,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -48288,17 +48186,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -48345,14 +48243,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -48424,13 +48322,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -48442,14 +48340,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -48461,14 +48359,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -48479,7 +48377,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -48488,62 +48386,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1894"
+     "referenced_type" : "type-1869"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2153"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -48648,23 +48546,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2304"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -48675,17 +48573,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -48730,17 +48628,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -48785,17 +48683,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -48842,7 +48740,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -48854,20 +48752,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -48919,13 +48817,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -48936,18 +48834,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2320"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -48958,18 +48856,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -48980,23 +48878,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -49006,14 +48904,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2149"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -49040,8 +48938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-2464",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -49050,8 +48948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -49060,85 +48958,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -49149,13 +49047,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2461"
+     "referenced_type" : "type-2436"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -49165,13 +49063,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2450"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -49181,13 +49079,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49197,13 +49095,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2421"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "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"
@@ -49213,13 +49111,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2443"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49229,13 +49127,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49245,13 +49143,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2413"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49261,13 +49159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2457"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49277,13 +49175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2429"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49293,13 +49191,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2459"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -49309,13 +49207,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49325,13 +49223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2427"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -49340,8 +49238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -49352,21 +49250,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -49375,21 +49273,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -49398,21 +49296,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -49421,21 +49319,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -49444,21 +49342,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -49467,21 +49365,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -49490,21 +49388,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -49513,21 +49411,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -49536,21 +49434,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -49559,21 +49457,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -49582,21 +49480,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -49605,21 +49503,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -49629,14 +49527,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -49648,14 +49546,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -49667,14 +49565,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -49686,14 +49584,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -49705,17 +49603,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -49725,26 +49623,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -49754,7 +49652,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-1805"
     }
    ],
    "fields" :
@@ -49762,13 +49660,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -49936,7 +49834,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -49944,13 +49842,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -50163,7 +50061,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -50171,13 +50069,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -50333,10 +50231,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -50345,44 +50243,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -50446,7 +50344,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -50481,11 +50379,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -50519,7 +50417,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -50528,31 +50426,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -50673,7 +50571,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -50681,18 +50579,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -50834,7 +50732,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1743"
+     "referenced_type" : "type-1717"
     }
    ],
    "fields" :
@@ -50842,13 +50740,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -50972,7 +50870,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -50980,13 +50878,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -51149,7 +51047,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -51157,13 +51055,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -51275,16 +51173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2344"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51292,16 +51190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2347"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51309,16 +51207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2372"
+     "referenced_type" : "type-2346"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51326,16 +51224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2348"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51343,220 +51241,220 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2371"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2370",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2375"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2364"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2363",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2363"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2362",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2365"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2362"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2361",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2366"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2365",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2349"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2350"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2352"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2353"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2354"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2353",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2345"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2344",
    "self_type" : "type-2344",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2346" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2349"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2340"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2339"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2338"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2324"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2325"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2330"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2320"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2321" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -51564,16 +51462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51581,16 +51479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51598,16 +51496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2357"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51615,16 +51513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51632,16 +51530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2358"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51649,16 +51547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2380"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51666,16 +51564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2359"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -51683,16 +51581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51700,16 +51598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2363"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51717,16 +51615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2362"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51734,16 +51632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2367"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2366",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51751,16 +51649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2366"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2365",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51768,16 +51666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2368"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2367",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51785,16 +51683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2365"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2364",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51802,16 +51700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2369"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2368",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -51819,372 +51717,372 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2427"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2426"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2425"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2424"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2422"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2430"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2429"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2431"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2423"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2428"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2432"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2413"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2412"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2411"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2410"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2416"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2415"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2417"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2409"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2414"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2418"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2401"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2400",
    "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2400"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2399"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2398"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2396"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2404"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2403"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2405"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2397"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2402"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2406"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2388"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2387"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2386",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2386"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2385"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2391"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2390"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2392"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2384"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2389"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2393"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2375"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -52193,13 +52091,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2400"
+     "referenced_type" : "type-2374"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2373",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52210,13 +52108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2399"
+     "referenced_type" : "type-2373"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52227,13 +52125,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52244,13 +52142,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2378"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52261,13 +52159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2377"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2376",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52278,13 +52176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2379"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2378",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52295,13 +52193,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2376"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52312,13 +52210,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2380"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2379",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52329,16 +52227,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2358"
+     "referenced_type" : "type-2333"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52346,16 +52244,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2332"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52363,16 +52261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2334"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -52380,16 +52278,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2335"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -52398,7 +52296,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -52408,11 +52306,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -52421,21 +52319,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52444,21 +52342,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -52467,21 +52365,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52490,21 +52388,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -52513,21 +52411,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -52541,16 +52439,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -52569,8 +52467,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -52583,17 +52481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -52603,17 +52501,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -52623,17 +52521,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -52643,17 +52541,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -52663,17 +52561,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -52683,17 +52581,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -52703,17 +52601,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -52723,17 +52621,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -52743,17 +52641,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -52763,317 +52661,317 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-662"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "record_kind" : "class",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-259"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-235"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-802"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-641"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-438"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
+   "record_kind" : "class",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2519"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2258" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
   },
   {
@@ -53083,17 +52981,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-127" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
   },
   {
@@ -53103,17 +53001,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance>",
    "name" : "android::sp<android::OMXNodeInstance>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
+   "template_args" : [ "type-825" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
   },
   {
@@ -53123,17 +53021,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
    "name" : "android::sp<android::OmxGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
+   "template_args" : [ "type-794" ],
    "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
   },
   {
@@ -53143,17 +53041,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2154"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2183" ],
+   "template_args" : [ "type-2155" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -53163,17 +53061,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2509"
+     "referenced_type" : "type-2485"
     }
    ],
    "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-2508",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2511" ],
+   "template_args" : [ "type-2487" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -53183,17 +53081,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2502"
+     "referenced_type" : "type-2477"
     }
    ],
    "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-2501",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2504" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -53203,17 +53101,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-40"
     }
    ],
    "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-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -53223,17 +53121,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-33"
     }
    ],
    "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-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -53243,17 +53141,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -53263,17 +53161,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2493"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2519" ],
+   "template_args" : [ "type-2495" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -53283,17 +53181,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -53303,17 +53201,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -53323,17 +53221,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -53343,17 +53241,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -53363,17 +53261,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -53383,17 +53281,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -53403,17 +53301,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -53423,223 +53321,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2489"
+     "referenced_type" : "type-2465"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2491" ],
+   "template_args" : [ "type-2467" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53649,283 +53547,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -53935,8 +53833,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53946,327 +53844,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54276,8 +54174,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54287,327 +54185,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54617,8 +54515,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54628,338 +54526,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1708",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1699",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54969,8 +54867,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54980,250 +54878,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -55234,16 +55132,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -55251,16 +55149,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -55268,16 +55166,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -55285,16 +55183,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -55302,16 +55200,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -55319,16 +55217,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1859"
+     "referenced_type" : "type-1837"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55336,16 +55234,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -55353,16 +55251,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1829"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55370,16 +55268,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -55387,16 +55285,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -55404,16 +55302,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -55421,16 +55319,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -55440,23 +55338,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -55466,23 +55364,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -55492,23 +55390,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -55518,23 +55416,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -55544,23 +55442,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -55570,23 +55468,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -55595,18 +55493,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -55622,18 +55520,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2123"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -55644,7 +55542,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2119"
     },
     {
      "field_name" : "num_planes",
@@ -55654,13 +55552,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -55671,48 +55569,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2117"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -55723,38 +55621,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -55765,18 +55663,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -55787,17 +55685,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -55817,13 +55715,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -55833,13 +55731,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -55850,35 +55748,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -55899,8 +55797,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -55911,43 +55809,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -55958,32 +55856,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -55993,13 +55891,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -56010,32 +55908,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -56045,13 +55943,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -56062,17 +55960,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -56102,13 +56000,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -56119,28 +56017,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -56152,8 +56050,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -56161,8 +56059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -56170,8 +56068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56179,8 +56077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56188,8 +56086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56197,8 +56095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56206,8 +56104,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 0752e71..0000000
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28763 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-483",
-   "self_type" : "type-485",
-   "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-461",
-   "self_type" : "type-465",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 2048,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-806",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-583",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-584",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-681",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-682",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-678",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long double",
-   "name" : "long double",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "__aeabi_memclr"
-  },
-  {
-   "name" : "__aeabi_memclr4"
-  },
-  {
-   "name" : "__aeabi_memclr8"
-  },
-  {
-   "name" : "__aeabi_memcpy"
-  },
-  {
-   "name" : "__aeabi_memcpy4"
-  },
-  {
-   "name" : "__aeabi_memcpy8"
-  },
-  {
-   "name" : "__aeabi_memmove"
-  },
-  {
-   "name" : "__aeabi_memmove4"
-  },
-  {
-   "name" : "__aeabi_memmove8"
-  },
-  {
-   "name" : "__aeabi_memset"
-  },
-  {
-   "name" : "__aeabi_memset4"
-  },
-  {
-   "name" : "__aeabi_memset8"
-  },
-  {
-   "name" : "__aeabi_uidiv"
-  },
-  {
-   "name" : "__udivsi3"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-690",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-688",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-815",
-   "return_type" : "type-30",
-   "self_type" : "type-815",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-1017"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-780",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-840"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-727"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-986"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-769",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-837",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-743",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-869",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-686",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-665",
-   "self_type" : "type-675",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-438",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-490",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1029",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-992",
-   "self_type" : "type-991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1013",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-726",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-834",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-967",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-737",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-734",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-869",
-   "self_type" : "type-976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-815",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1031",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-447",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-458",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-991",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-730",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-728",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 80,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-726",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-979",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-834",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-477",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-766",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-758",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-778",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-450",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-985",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-1000",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-737",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1009",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-743",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-749",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-734",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "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-479",
-   "self_type" : "type-478",
-   "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-519",
-   "self_type" : "type-518",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-969",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-788",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-441",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-432",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-422",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-434",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-428",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-838",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-558"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-493"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-488"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-532"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-534"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-520"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-552"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-550"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-491"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-454"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-453"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-482"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-485"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-507"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-509"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-502"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-503"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-590"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-582"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-618"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-602"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-621"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-712"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-594"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-613"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-600"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-671"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-669"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-679"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-681"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-682"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-676"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-467"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-615"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-592"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-689"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-690"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-684"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-688"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-690"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-663"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-652"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-653"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-628"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-630"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-638"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-639"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-633"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-631"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-642"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-645"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-646"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-650"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-648"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-962",
-   "self_type" : "type-962",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 2088,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-567" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1018"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-810"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1016",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-565"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-959"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-946"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-944"
-    }
-   ],
-   "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-943",
-   "self_type" : "type-943",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-942"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-935"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-934",
-   "self_type" : "type-934",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-938"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-955"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-953"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-940"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-951"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-874"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-873"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-850" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-849" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-845" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-890"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-889"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-888",
-   "self_type" : "type-888",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-894"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-892"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-896"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-895",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-927"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-926",
-   "self_type" : "type-926",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-926"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-925",
-   "self_type" : "type-925",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-925"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-924",
-   "self_type" : "type-924",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-924"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-922"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-921",
-   "self_type" : "type-921",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-930"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-928"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-932"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-914"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-913"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-911"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-917"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-916"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-918"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-915"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-919"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-918",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-901"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-900"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-905"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-904",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-903"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-907"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-861"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-725"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-978"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-979" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-753",
-   "self_type" : "type-753",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-720",
-   "self_type" : "type-720",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1036",
-   "self_type" : "type-1036",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1023",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1034",
-   "self_type" : "type-1034",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1005",
-   "self_type" : "type-1005",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-683",
-   "self_type" : "type-683",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1028",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1035",
-   "self_type" : "type-1035",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1006",
-   "self_type" : "type-1006",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-724",
-   "self_type" : "type-724",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-936",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1022",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-897",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-802"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-804"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-800"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-776",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
index a217662..34eb0df 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -38,16 +18,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 8
   },
   {
@@ -55,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -64,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 8
   },
   {
@@ -81,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 8
   },
   {
@@ -90,8 +70,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -100,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -110,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
@@ -120,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 4
   },
   {
@@ -130,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 8
   },
   {
@@ -140,66 +120,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -214,19 +239,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -234,6 +279,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -298,6 +355,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -318,11 +379,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -330,7 +427,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -338,6 +459,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -389,389 +522,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -781,10 +603,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -794,10 +616,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -807,10 +629,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -820,24 +642,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -847,10 +655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -860,24 +668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -887,37 +681,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -925,10 +701,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -936,8 +721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +730,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -958,7 +752,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -966,8 +760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -975,35 +769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1016,8 +783,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1025,8 +792,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1035,19 +802,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1055,8 +822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1065,8 +832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1075,8 +842,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1089,92 +866,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1182,7 +875,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1192,39 +885,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1234,18 +937,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1256,23 +959,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/32/x86/source-based/libstagefright_omx.so.lsdump b/Q/32/x86/source-based/libstagefright_omx.so.lsdump
index 0193e2d..f0b38fe 100644
--- a/Q/32/x86/source-based/libstagefright_omx.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
    "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-1682",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1802",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2644",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2421",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -147,49 +147,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1984",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2714",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2697",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -197,8 +188,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2697",
+   "self_type" : "type-2696",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -206,98 +197,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2698",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2447",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2570",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -306,7 +216,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -315,7 +225,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -324,7 +234,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -333,7 +243,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -342,7 +252,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -351,7 +261,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -360,7 +270,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -369,7 +279,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -382,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -391,8 +301,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -401,24 +311,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -426,8 +336,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -435,8 +345,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1650",
    "size" : 4
   },
   {
@@ -444,8 +354,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -453,8 +363,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -462,8 +372,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -492,8 +402,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1655",
+   "self_type" : "type-1655",
    "size" : 4
   },
   {
@@ -502,8 +412,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -512,15 +422,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -943,10 +853,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1084,6 +994,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1422,6 +1335,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1430,9 +1347,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1472,10 +1405,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1685,7 +1614,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1759,8 +1688,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1837,8 +1766,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1891,8 +1820,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1989,8 +1918,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2480",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2035,8 +1964,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2085,8 +2014,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2135,8 +2064,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2177,8 +2106,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2243,8 +2172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2385,8 +2314,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2427,8 +2356,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2465,8 +2394,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2440,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2482,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2611,8 +2540,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2665,8 +2594,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2707,8 +2636,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2753,8 +2682,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2720,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2829,8 +2758,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2887,8 +2816,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2921,8 +2850,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2884,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2997,8 +2926,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3039,8 +2968,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3065,8 +2994,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3103,8 +3032,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3157,8 +3086,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2961",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2935",
+   "self_type" : "type-2935",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3399,8 +3328,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3445,8 +3374,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3551,8 +3480,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3593,8 +3522,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3619,8 +3548,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3797,11 +3726,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3871,8 +3800,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3937,8 +3866,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3971,8 +3900,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4017,8 +3946,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4087,8 +4016,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2933",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2912",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4153,8 +4082,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4203,8 +4132,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4245,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4295,8 +4224,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4337,8 +4266,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4531,8 +4460,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5229,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5391,8 +5320,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5433,8 +5362,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5471,8 +5400,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5509,8 +5438,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5551,8 +5480,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2977",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2956",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5589,8 +5518,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5619,8 +5548,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5665,8 +5594,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5707,8 +5636,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5757,8 +5686,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5720,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5825,8 +5754,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5863,8 +5792,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5901,8 +5830,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5935,8 +5864,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5973,8 +5902,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5956,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6053,8 +5982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6079,8 +6008,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6185,8 +6114,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6223,8 +6152,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6245,8 +6174,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6299,8 +6228,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6337,8 +6266,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6419,8 +6348,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6469,8 +6398,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6527,8 +6456,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6589,8 +6518,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6647,8 +6576,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6709,8 +6638,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6764,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6844,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6957,8 +6886,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7053,8 +6982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7119,8 +7048,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7209,8 +7138,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7267,8 +7196,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7309,8 +7238,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7347,8 +7276,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7373,8 +7302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7451,8 +7380,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7434,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7547,8 +7476,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7613,8 +7542,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3041",
-   "self_type" : "type-3041",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7655,8 +7584,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7713,8 +7642,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7668,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3100",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3074",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7765,8 +7694,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7811,8 +7740,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7857,8 +7786,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7887,8 +7816,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7945,8 +7874,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2932",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8011,8 +7940,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8045,8 +7974,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3073",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8111,8 +8040,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-3097",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3070",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8169,8 +8098,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-3098",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3072",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8191,8 +8120,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8209,65 +8138,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2902",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8306,8 +8184,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8344,8 +8222,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8374,8 +8252,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2872",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2841",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8396,8 +8274,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8430,11 +8308,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8456,8 +8334,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8483,8 +8361,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8501,8 +8379,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8519,8 +8397,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8545,8 +8423,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8587,8 +8465,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8649,11 +8527,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8753,8 +8631,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1937",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8779,8 +8657,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1950",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8821,8 +8699,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9063,8 +8941,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9093,8 +8971,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9123,8 +9001,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9165,8 +9043,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9203,8 +9081,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9229,8 +9107,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9247,8 +9125,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9277,8 +9155,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-1940",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9371,8 +9249,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9413,8 +9291,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1920",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9431,8 +9309,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9461,8 +9339,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9495,8 +9373,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9549,8 +9427,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9566,12 +9444,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9581,15 +9459,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9599,24 +9477,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9626,27 +9504,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9656,24 +9534,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9683,18 +9561,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9704,21 +9582,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9728,18 +9606,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9749,15 +9627,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9767,18 +9645,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9788,24 +9666,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9815,18 +9693,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9836,18 +9714,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9857,24 +9735,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9884,18 +9762,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9905,13 +9783,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -9920,12 +9798,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9935,12 +9813,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2043",
-   "return_type" : "type-67",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2023",
+   "return_type" : "type-60",
+   "self_type" : "type-2023",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -9950,27 +9828,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -9982,10 +9860,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -9996,10 +9874,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2811"
+     "referenced_type" : "type-2785"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10010,10 +9888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2818"
+     "referenced_type" : "type-2792"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10024,10 +9902,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10037,13 +9915,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10053,20 +9931,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10076,7 +9954,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10085,7 +9963,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10095,13 +9973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10111,26 +9989,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10140,16 +10018,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10159,16 +10037,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3160"
+     "referenced_type" : "type-3146"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10179,22 +10057,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-3142"
     },
     {
-     "referenced_type" : "type-3117"
+     "referenced_type" : "type-3091"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10205,10 +10083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10221,19 +10099,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10244,10 +10122,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10260,19 +10138,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10283,25 +10161,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10312,7 +10190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10327,13 +10205,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10344,13 +10222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10360,10 +10238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10374,16 +10252,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10394,7 +10272,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10403,7 +10281,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10413,13 +10291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10430,10 +10308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10444,13 +10322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10460,13 +10338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10476,16 +10354,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10496,7 +10374,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10505,7 +10383,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10516,7 +10394,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10525,7 +10403,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10535,16 +10413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10555,13 +10433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10572,10 +10450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10464,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,13 +10500,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10639,7 +10517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10648,7 +10526,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10659,19 +10537,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10682,13 +10560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10699,19 +10577,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10722,13 +10600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10739,19 +10617,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10761,7 +10639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10770,16 +10648,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10790,25 +10668,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10819,19 +10697,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10841,16 +10719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10861,13 +10739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10878,16 +10756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10897,22 +10775,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10923,19 +10801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10946,25 +10824,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10974,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -10989,7 +10867,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11000,22 +10878,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11026,22 +10904,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11052,19 +10930,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11074,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11087,13 +10965,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11102,10 +10980,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11115,10 +10993,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11127,7 +11005,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11137,10 +11015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11150,10 +11028,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11163,19 +11041,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11185,19 +11063,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11207,13 +11085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11223,13 +11101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11239,19 +11117,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11261,19 +11139,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11283,19 +11161,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11306,10 +11184,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11320,10 +11198,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11334,10 +11212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11346,13 +11224,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11361,13 +11239,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11376,10 +11254,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11388,13 +11266,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11403,19 +11281,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11425,10 +11303,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11438,10 +11316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11451,16 +11329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11472,7 +11350,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11482,10 +11360,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11495,13 +11373,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11511,13 +11389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11527,13 +11405,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11542,10 +11420,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11555,13 +11433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-2746"
+     "referenced_type" : "type-2720"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11571,13 +11449,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11587,13 +11465,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11603,13 +11481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-2750"
+     "referenced_type" : "type-2724"
     }
    ],
-   "return_type" : "type-3175",
+   "return_type" : "type-3163",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11619,13 +11497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11635,13 +11513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11651,10 +11529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11664,10 +11542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11677,13 +11555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11693,16 +11571,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2879"
+     "referenced_type" : "type-2852"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11712,10 +11590,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11725,13 +11603,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11741,13 +11619,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11757,10 +11635,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3178",
+   "return_type" : "type-3166",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11770,10 +11648,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3179",
+   "return_type" : "type-3167",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11783,13 +11661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3180",
+   "return_type" : "type-3168",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11799,16 +11677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2882"
+     "referenced_type" : "type-2856"
     }
    ],
-   "return_type" : "type-3181",
+   "return_type" : "type-3169",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11818,10 +11696,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3182",
+   "return_type" : "type-3170",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11831,13 +11709,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11847,13 +11725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11863,16 +11741,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3185",
+   "return_type" : "type-3173",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11882,13 +11760,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3186",
+   "return_type" : "type-3174",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11898,13 +11776,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3187",
+   "return_type" : "type-3175",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11914,13 +11792,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-3188",
+   "return_type" : "type-3176",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11930,13 +11808,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3189",
+   "return_type" : "type-3177",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11946,16 +11824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-3190",
+   "return_type" : "type-3178",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11965,13 +11843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-3192"
+     "referenced_type" : "type-3180"
     }
    ],
-   "return_type" : "type-3191",
+   "return_type" : "type-3179",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11981,10 +11859,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-3193",
+   "return_type" : "type-3181",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11994,13 +11872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3194",
+   "return_type" : "type-3182",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12010,16 +11888,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-3196"
+     "referenced_type" : "type-3184"
     }
    ],
-   "return_type" : "type-3195",
+   "return_type" : "type-3183",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12029,13 +11907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-3197",
+   "return_type" : "type-3185",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12045,13 +11923,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12061,13 +11939,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12077,16 +11955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12096,19 +11974,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-3201"
+     "referenced_type" : "type-3189"
     }
    ],
-   "return_type" : "type-3200",
+   "return_type" : "type-3188",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12118,13 +11996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3203"
+     "referenced_type" : "type-3191"
     }
    ],
-   "return_type" : "type-3202",
+   "return_type" : "type-3190",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12134,13 +12012,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3156"
+     "referenced_type" : "type-3130"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12150,13 +12028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3205"
+     "referenced_type" : "type-3193"
     }
    ],
-   "return_type" : "type-3204",
+   "return_type" : "type-3192",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12166,10 +12044,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12179,10 +12057,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12192,10 +12070,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12205,10 +12083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12218,10 +12096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12231,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3207"
+     "referenced_type" : "type-3195"
     }
    ],
-   "return_type" : "type-3206",
+   "return_type" : "type-3194",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12247,13 +12125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3209"
+     "referenced_type" : "type-3197"
     }
    ],
-   "return_type" : "type-3208",
+   "return_type" : "type-3196",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12263,13 +12141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-3210",
+   "return_type" : "type-3198",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12279,79 +12157,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3212"
+     "referenced_type" : "type-3200"
     }
    ],
-   "return_type" : "type-3211",
+   "return_type" : "type-3199",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12361,10 +12239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12374,10 +12252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12387,10 +12265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12400,20 +12278,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12423,7 +12301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12432,7 +12310,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12442,26 +12320,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12471,16 +12349,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12490,16 +12368,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3214"
+     "referenced_type" : "type-3202"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12509,19 +12387,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12531,19 +12409,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12553,13 +12431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2557"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12569,13 +12447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12585,16 +12463,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12604,7 +12482,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12613,16 +12491,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12632,16 +12510,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12651,22 +12529,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12676,13 +12554,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12691,7 +12569,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12701,10 +12579,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12714,19 +12592,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12736,19 +12614,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,19 +12636,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12780,13 +12658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12796,13 +12674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12812,19 +12690,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3215",
+   "return_type" : "type-3203",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12834,7 +12712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12843,7 +12721,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3216",
+   "return_type" : "type-3204",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12853,25 +12731,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3217",
+   "return_type" : "type-3205",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12881,16 +12759,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-3218",
+   "return_type" : "type-3206",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12900,16 +12778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3220"
+     "referenced_type" : "type-3208"
     }
    ],
-   "return_type" : "type-3219",
+   "return_type" : "type-3207",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12919,19 +12797,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3222"
+     "referenced_type" : "type-3210"
     }
    ],
-   "return_type" : "type-3221",
+   "return_type" : "type-3209",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12941,16 +12819,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3223",
+   "return_type" : "type-3211",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,13 +12838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-3224",
+   "return_type" : "type-3212",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12976,13 +12854,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-3225",
+   "return_type" : "type-3213",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12992,16 +12870,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2601"
+     "referenced_type" : "type-2575"
     },
     {
-     "referenced_type" : "type-3227"
+     "referenced_type" : "type-3215"
     }
    ],
-   "return_type" : "type-3226",
+   "return_type" : "type-3214",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13011,19 +12889,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-3229"
+     "referenced_type" : "type-3217"
     }
    ],
-   "return_type" : "type-3228",
+   "return_type" : "type-3216",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13033,16 +12911,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3231"
+     "referenced_type" : "type-3219"
     }
    ],
-   "return_type" : "type-3230",
+   "return_type" : "type-3218",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13052,22 +12930,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3233"
+     "referenced_type" : "type-3221"
     }
    ],
-   "return_type" : "type-3232",
+   "return_type" : "type-3220",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13077,13 +12955,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13092,7 +12970,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3234",
+   "return_type" : "type-3222",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,10 +12980,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-3235",
+   "return_type" : "type-3223",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13115,19 +12993,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3237"
+     "referenced_type" : "type-3225"
     }
    ],
-   "return_type" : "type-3236",
+   "return_type" : "type-3224",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3238",
+   "return_type" : "type-3226",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13156,19 +13034,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-3240"
+     "referenced_type" : "type-3228"
     }
    ],
-   "return_type" : "type-3239",
+   "return_type" : "type-3227",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,13 +13056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13194,13 +13072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13211,10 +13089,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13225,10 +13103,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13238,10 +13130,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13250,7 +13142,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13260,16 +13152,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13279,22 +13171,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2322"
+     "referenced_type" : "type-2311"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2325"
+     "referenced_type" : "type-2316"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13304,13 +13196,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13321,13 +13213,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13338,13 +13230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13354,10 +13246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13367,10 +13259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13380,10 +13272,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13393,10 +13285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13406,10 +13298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13420,16 +13312,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13440,16 +13332,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13460,16 +13352,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13480,19 +13372,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13503,19 +13395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13526,19 +13418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13549,19 +13441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13572,16 +13464,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13592,16 +13484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13612,16 +13504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13632,19 +13524,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13655,19 +13547,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13678,19 +13570,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13701,19 +13593,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13724,16 +13616,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13744,16 +13636,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13764,16 +13656,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13784,19 +13676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13807,19 +13699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13830,19 +13722,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13853,19 +13745,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13876,16 +13768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13896,16 +13788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13916,16 +13808,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13936,19 +13828,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13959,19 +13851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13982,19 +13874,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14005,19 +13897,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14028,16 +13920,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14048,16 +13940,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14068,16 +13960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14088,19 +13980,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14111,19 +14003,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14134,19 +14026,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14157,19 +14049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14180,16 +14072,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14200,16 +14092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14220,16 +14112,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14240,19 +14132,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14263,19 +14155,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14286,19 +14178,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14309,19 +14201,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14332,16 +14224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14352,16 +14244,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14372,16 +14264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14392,19 +14284,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14415,19 +14307,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14438,19 +14330,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14461,19 +14353,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14484,16 +14376,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14504,16 +14396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14524,16 +14416,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14544,19 +14436,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14567,19 +14459,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14590,19 +14482,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14613,19 +14505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14636,16 +14528,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14656,16 +14548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14676,16 +14568,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14696,19 +14588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14719,19 +14611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14742,19 +14634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14765,19 +14657,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14788,16 +14680,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14808,16 +14700,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14828,19 +14720,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14851,19 +14743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14874,19 +14766,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14897,19 +14789,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14920,16 +14812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14940,16 +14832,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14960,19 +14852,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14983,19 +14875,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15006,19 +14898,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15029,19 +14921,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15051,16 +14943,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15069,14 +14961,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15085,8 +14971,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15094,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15103,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15112,8 +14998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15121,8 +15007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15130,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15139,8 +15025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15148,8 +15034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15157,8 +15043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15166,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15175,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15184,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15193,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15202,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15211,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15220,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2608",
-   "self_type" : "type-2607",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15229,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
+   "referenced_type" : "type-2704",
+   "self_type" : "type-2703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15238,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15247,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2858",
+   "self_type" : "type-2857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15256,17 +15142,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2279",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15274,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15283,35 +15169,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2234",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15319,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15328,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15337,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15346,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15355,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15364,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15373,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15382,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15391,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15400,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15409,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15418,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15427,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2559",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15436,8 +15322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2733",
-   "self_type" : "type-2732",
+   "referenced_type" : "type-2706",
+   "self_type" : "type-2705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15445,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15454,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15463,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15472,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15481,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15490,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15499,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15508,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15517,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15526,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15544,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15553,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15562,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15571,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15580,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15589,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15598,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15607,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15616,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3105",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15625,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15670,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15679,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15688,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -15697,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -15706,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15715,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15724,564 +15610,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2301",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2646",
-   "self_type" : "type-2648",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2924",
-   "self_type" : "type-2926",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2017",
-   "self_type" : "type-2019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2583",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2792",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2914",
-   "self_type" : "type-2916",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2276",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2477",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2775",
-   "self_type" : "type-2777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2626",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2260",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2617",
-   "self_type" : "type-2619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2894",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16289,539 +15617,638 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2010",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2282",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2598",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2777",
+   "self_type" : "type-2779",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2783",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2765",
+   "self_type" : "type-2767",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2882",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2314",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2599",
-   "self_type" : "type-2601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-2748",
-   "self_type" : "type-2750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2589",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2027",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2595",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2797",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2919",
-   "self_type" : "type-2921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2013",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2786",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2911",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2653",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2808",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2929",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2271",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2472",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2603",
-   "self_type" : "type-2605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2769",
-   "self_type" : "type-2772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1984",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2256",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2457",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2613",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2889",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2888",
    "self_type" : "type-2891",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2247",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2447",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2600",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2752",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2852",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2595",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2854",
+   "self_type" : "type-2856",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-980",
    "self_type" : "type-982",
    "size" : 4,
@@ -16829,107 +16256,98 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1757",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1945",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2285",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1751",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2575",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2724",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-1990",
    "self_type" : "type-1992",
    "size" : 4,
@@ -16937,17 +16355,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2265",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-2464",
    "self_type" : "type-2466",
    "size" : 4,
@@ -16955,44 +16373,107 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2586",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2766",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2774",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2897",
-   "self_type" : "type-2899",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2896",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2418",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2759",
+   "self_type" : "type-2761",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2885",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -17000,10 +16481,424 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2001",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2909",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2440",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2878",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2227",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2587",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2730",
+   "self_type" : "type-2732",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1790",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2236",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2435",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2557",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2870",
+   "self_type" : "type-2873",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17011,8 +16906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17020,8 +16915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17029,8 +16924,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17038,8 +16933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17047,8 +16942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17056,8 +16951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17065,8 +16960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17074,8 +16969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17083,8 +16978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17092,8 +16987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -17101,8 +16996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17110,8 +17005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17119,8 +17014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17128,8 +17023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3156",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17137,8 +17032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17146,8 +17041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17155,8 +17050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -17164,8 +17059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17173,8 +17068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -17182,8 +17077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17200,8 +17095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17209,8 +17104,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17218,8 +17113,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17227,8 +17122,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17236,8 +17131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17245,8 +17140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17254,8 +17149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17263,8 +17158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17272,8 +17167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17281,17 +17176,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2718",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17299,8 +17212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17308,8 +17221,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17317,8 +17230,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17326,8 +17239,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17335,8 +17248,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17344,8 +17257,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17353,8 +17266,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17362,8 +17275,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-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17371,8 +17284,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-2739",
-   "self_type" : "type-2738",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17380,8 +17293,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17389,8 +17302,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17399,7 +17312,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17407,8 +17320,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -17419,8 +17332,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17428,8 +17341,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17437,26 +17350,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17464,8 +17377,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17473,8 +17386,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17482,8 +17395,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17491,8 +17404,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17500,8 +17413,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1921",
-   "self_type" : "type-1920",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17509,8 +17422,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17518,8 +17431,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17527,8 +17440,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17536,8 +17449,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17545,8 +17458,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2729",
-   "self_type" : "type-2728",
+   "referenced_type" : "type-2702",
+   "self_type" : "type-2701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17554,8 +17467,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17563,8 +17476,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17572,8 +17485,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17581,8 +17494,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17590,8 +17503,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -17599,8 +17512,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17608,8 +17521,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17617,150 +17530,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2325",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -17768,35 +17537,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -17804,11 +17609,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -17816,7 +17729,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17824,8 +17737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17833,8 +17746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17842,8 +17755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17851,8 +17764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17860,8 +17773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17869,8 +17782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17878,8 +17791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17887,8 +17800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17896,8 +17809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17905,8 +17818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17914,8 +17827,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2700",
+   "self_type" : "type-2699",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17923,8 +17836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17932,8 +17845,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17941,8 +17854,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17950,8 +17863,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17959,8 +17872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17968,8 +17881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17977,8 +17890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17986,8 +17899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17995,1329 +17908,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2610",
-   "self_type" : "type-2609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2754",
-   "self_type" : "type-2753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2886",
-   "self_type" : "type-2885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2078",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2702",
-   "self_type" : "type-2701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2805",
-   "self_type" : "type-2804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2928",
-   "self_type" : "type-2927",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2579",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -19325,170 +17915,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1709",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2572",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2223",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -19496,3536 +17978,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2173",
-   "self_type" : "type-2172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2543",
-   "self_type" : "type-2542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2700",
-   "self_type" : "type-2699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2070",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2492",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2779",
-   "self_type" : "type-2778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2908",
-   "self_type" : "type-2907",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2857",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2763",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2691",
-   "self_type" : "type-2690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2840",
-   "self_type" : "type-2839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3125",
-   "self_type" : "type-3124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2697",
-   "self_type" : "type-2696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2339",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2695",
-   "self_type" : "type-2694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2844",
-   "self_type" : "type-2843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1846",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2537",
-   "self_type" : "type-2536",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2812",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2625",
-   "self_type" : "type-2624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2486",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2637",
-   "self_type" : "type-2636",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2517",
-   "self_type" : "type-2516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2704",
-   "self_type" : "type-2703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2520",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2708",
-   "self_type" : "type-2707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2669",
-   "self_type" : "type-2668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2824",
-   "self_type" : "type-2823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2848",
-   "self_type" : "type-2847",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2177",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2519",
-   "self_type" : "type-2518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2654",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-2578",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-2747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2822",
-   "self_type" : "type-2821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3112",
-   "self_type" : "type-3111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -23033,10 +18041,4915 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1924",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2908",
+   "self_type" : "type-2907",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2768",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2881",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1710",
+   "self_type" : "type-1709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2823",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2795",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2725",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2787",
+   "self_type" : "type-2786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2791",
+   "self_type" : "type-2790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2454",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2610",
+   "self_type" : "type-2609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2467",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2897",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2430",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-2550",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-2721",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2789",
+   "self_type" : "type-2788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2629",
+   "self_type" : "type-2628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3086",
+   "self_type" : "type-3085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23044,8 +22957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23053,8 +22966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23062,8 +22975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23071,8 +22984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23080,96 +22993,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3042",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -23177,10 +23000,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23188,8 +23101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3154",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23197,8 +23110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23206,8 +23119,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-3130",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23215,8 +23128,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-3123",
-   "self_type" : "type-3127",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23224,8 +23137,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23233,8 +23146,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23242,8 +23155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23251,8 +23164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23260,8 +23173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-3148",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-3122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23269,8 +23182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23278,8 +23191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2960",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23287,8 +23200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-938",
+   "self_type" : "type-3120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23296,8 +23209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23305,8 +23218,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23314,8 +23227,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23323,8 +23236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23332,8 +23245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23341,8 +23254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23350,8 +23263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23359,8 +23272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1964",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -23368,8 +23281,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23377,8 +23290,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -23386,8 +23299,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -23395,8 +23308,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23404,8 +23317,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2938",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -23413,8 +23326,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -23422,8 +23335,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -23431,8 +23344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3067",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -23440,8 +23353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -23449,8 +23362,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23458,8 +23371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23467,8 +23380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2873",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2846",
+   "self_type" : "type-2847",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23476,8 +23389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23485,8 +23398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2723",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23494,8 +23407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -23503,8 +23416,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23512,8 +23425,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23521,8 +23434,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23530,8 +23443,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23539,8 +23452,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23548,96 +23461,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1746",
-   "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-2049",
-   "self_type" : "type-2052",
-   "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-2187",
-   "self_type" : "type-2189",
-   "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-2329",
-   "self_type" : "type-2331",
-   "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-2530",
-   "self_type" : "type-2532",
-   "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-2687",
-   "self_type" : "type-2689",
-   "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-2836",
-   "self_type" : "type-2838",
-   "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-42",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemory *",
-   "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemoryHeap *",
-   "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2698",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMXBufferSource *",
-   "name" : "const android::IOMXBufferSource *",
    "referenced_type" : "type-1715",
    "self_type" : "type-1717",
    "size" : 4,
@@ -23645,10 +23468,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
+   "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-2018",
+   "self_type" : "type-2020",
+   "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-2156",
+   "self_type" : "type-2158",
+   "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-2301",
+   "self_type" : "type-2304",
+   "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-2500",
+   "self_type" : "type-2502",
+   "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-2659",
+   "self_type" : "type-2661",
+   "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-2810",
+   "self_type" : "type-2812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemory *",
+   "name" : "const android::IMemory *",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemoryHeap *",
+   "name" : "const android::IMemoryHeap *",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMXBufferSource *",
+   "name" : "const android::IOMXBufferSource *",
+   "referenced_type" : "type-3081",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23656,8 +23569,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23665,8 +23578,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23674,8 +23587,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23683,8 +23596,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23692,8 +23605,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23701,8 +23614,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23710,8 +23623,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23719,8 +23632,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23728,8 +23641,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -23737,26 +23650,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2259",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2238",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23764,8 +23677,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23773,8 +23686,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23782,8 +23695,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23791,8 +23704,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23800,8 +23713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23809,8 +23722,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23818,8 +23731,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23827,8 +23740,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3159",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23836,8 +23749,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23845,8 +23758,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23854,8 +23767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23863,8 +23776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23872,8 +23785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23881,8 +23794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23890,8 +23803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23899,8 +23812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23908,8 +23821,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23917,8 +23830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23926,8 +23839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23935,8 +23848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23944,8 +23857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2718",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23953,8 +23866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23962,8 +23875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23971,8 +23884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23980,8 +23893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23989,8 +23902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2782",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2744",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23998,8 +23911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24007,8 +23920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24016,8 +23929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24025,8 +23938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24034,8 +23947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24043,8 +23956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24052,8 +23965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24061,8 +23974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24070,8 +23983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24079,8 +23992,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24088,8 +24001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24097,8 +24010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24106,8 +24019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24115,8 +24028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24124,8 +24037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24133,8 +24046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24142,8 +24055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24151,8 +24064,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24160,8 +24073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -24169,8 +24082,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24178,8 +24091,26 @@
    "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-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24187,8 +24118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24196,8 +24127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24205,8 +24136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24214,8 +24145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24223,8 +24154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24232,8 +24163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24241,8 +24172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24250,8 +24181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24259,8 +24190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24268,8 +24199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24277,8 +24208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24286,8 +24217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24295,8 +24226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24304,8 +24235,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24313,8 +24244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24322,8 +24253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24331,8 +24262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24340,8 +24271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24349,8 +24280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24358,8 +24289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
    "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24367,8 +24298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> *",
    "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24376,8 +24307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> *",
    "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24385,8 +24316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
    "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24394,8 +24325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24403,42 +24334,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "referenced_type" : "type-3136",
    "self_type" : "type-3137",
    "size" : 4,
@@ -24446,10 +24341,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-3128",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24457,8 +24388,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-80",
-   "self_type" : "type-81",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24466,8 +24397,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-73",
-   "self_type" : "type-74",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24475,8 +24406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24484,8 +24415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24493,8 +24424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-3149",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24502,8 +24433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24511,8 +24442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2990",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24520,8 +24451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-937",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24529,8 +24460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24538,8 +24469,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24547,8 +24478,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-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24556,8 +24487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24565,8 +24496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24574,8 +24505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24583,26 +24514,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24610,8 +24532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24619,8 +24541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24628,8 +24550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24637,8 +24559,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24646,8 +24568,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24655,8 +24577,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-2151",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24664,8 +24586,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-2250",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24673,8 +24595,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-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24682,8 +24604,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24691,8 +24613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24700,8 +24622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24709,8 +24631,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2762",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24718,8 +24640,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -24727,8 +24649,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24736,8 +24658,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24745,8 +24667,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24754,8 +24676,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24763,8 +24685,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -24773,7 +24695,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -24782,7 +24704,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24790,8 +24712,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24799,8 +24721,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24808,8 +24730,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24817,8 +24739,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -24830,8 +24752,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24840,8 +24762,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24850,8 +24772,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -24860,8 +24782,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24870,8 +24792,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24880,8 +24802,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24890,8 +24812,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24900,8 +24822,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24910,8 +24832,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24920,8 +24842,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24930,8 +24852,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24940,8 +24862,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24950,8 +24872,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24960,8 +24882,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24970,8 +24892,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2358",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24980,8 +24902,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24990,8 +24912,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25000,8 +24922,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25010,8 +24932,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2709",
-   "self_type" : "type-2711",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25020,8 +24942,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25030,8 +24952,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25040,8 +24962,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25050,8 +24972,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2303",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -25060,8 +24982,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25070,8 +24992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2934",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -25080,8 +25002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -25090,8 +25012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-69",
+   "self_type" : "type-3062",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -25100,8 +25022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3066",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25110,8 +25032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2339",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25120,8 +25042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25130,8 +25052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25140,8 +25062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2846",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25150,8 +25072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25160,8 +25082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2722",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2691",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25170,8 +25092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -25180,8 +25102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25190,8 +25112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25200,8 +25122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25210,8 +25132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25220,8 +25142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25230,8 +25152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25240,8 +25162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25250,8 +25172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25270,8 +25192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25280,8 +25202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25290,8 +25212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25300,8 +25222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25310,8 +25232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25320,8 +25242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25330,8 +25252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25340,8 +25262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3144",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25350,8 +25272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -25360,8 +25282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25370,8 +25292,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25380,8 +25302,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25390,8 +25312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25400,8 +25322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25410,8 +25332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25420,8 +25342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2616",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25430,8 +25352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25440,8 +25362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25450,8 +25372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25460,8 +25382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3108",
-   "self_type" : "type-3107",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25470,8 +25392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25480,8 +25402,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25490,8 +25412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25500,8 +25422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25510,8 +25432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2191",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25520,8 +25442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25530,8 +25452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25540,8 +25462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25550,8 +25472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -25560,29 +25482,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2252",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2237",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2218",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -25590,8 +25512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25600,8 +25522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25610,8 +25532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25620,8 +25542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25630,8 +25552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25640,8 +25562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25650,8 +25572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -25660,8 +25582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25670,8 +25592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25680,8 +25602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25690,18 +25612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -25710,8 +25622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25720,8 +25632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25730,8 +25642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25740,8 +25652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -25750,8 +25662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2791",
-   "self_type" : "type-2790",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25760,8 +25672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25770,18 +25682,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25790,8 +25712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25800,8 +25722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25810,8 +25732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25820,8 +25742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25830,8 +25752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2598",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25840,8 +25762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2628",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2750",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25850,28 +25772,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2213",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-825",
+   "self_type" : "type-3132",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25880,8 +25812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25890,8 +25822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25900,8 +25832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25910,8 +25842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25920,8 +25852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -25930,8 +25862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25940,8 +25872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25950,8 +25882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25960,8 +25892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25970,8 +25902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25980,8 +25912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25990,8 +25922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26000,8 +25932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26010,8 +25942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26020,8 +25952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2720",
-   "self_type" : "type-2719",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26030,8 +25962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26040,8 +25972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26050,8 +25982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26060,8 +25992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26070,8 +26002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -26080,8 +26012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26090,8 +26022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26100,8 +26032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26110,8 +26042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1894",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26120,8 +26052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26130,8 +26062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1883",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26140,8 +26072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26150,8 +26082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26160,8 +26092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26170,8 +26102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26180,8 +26112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -26190,8 +26122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26200,8 +26132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26210,8 +26142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26220,8 +26152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26230,8 +26162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-272",
+   "self_type" : "type-1876",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -26240,8 +26172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -26250,8 +26182,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -26260,8 +26192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2584",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -26270,8 +26202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26280,8 +26212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26290,8 +26222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26300,8 +26232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26310,8 +26242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26320,8 +26252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2618",
-   "self_type" : "type-2617",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2588",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26330,8 +26262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2759",
-   "self_type" : "type-2758",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26340,8 +26272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2893",
-   "self_type" : "type-2892",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26350,8 +26282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26360,8 +26292,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26370,8 +26302,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-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26380,8 +26312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26390,8 +26322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26400,8 +26332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26410,8 +26342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26420,8 +26352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26430,18 +26362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2597",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2569",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26450,8 +26372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2781",
-   "self_type" : "type-2780",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2756",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26460,18 +26382,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2881",
-   "self_type" : "type-2880",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26480,8 +26412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26490,8 +26422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26500,8 +26432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2572",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26510,8 +26442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26520,8 +26452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2723",
+   "self_type" : "type-2722",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -26530,8 +26462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-2588",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26540,8 +26472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26550,8 +26482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26560,8 +26492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26570,8 +26502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26580,8 +26512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26590,8 +26522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2495",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2464",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26600,8 +26532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26610,8 +26542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2796",
-   "self_type" : "type-2795",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26620,8 +26552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2920",
-   "self_type" : "type-2919",
+   "referenced_type" : "type-2895",
+   "self_type" : "type-2894",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26630,8 +26562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26640,18 +26572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26660,8 +26582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26670,8 +26592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26680,8 +26602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26690,8 +26612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26700,8 +26622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2785",
-   "self_type" : "type-2784",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26710,98 +26632,128 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2621",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2783",
+   "self_type" : "type-2782",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
    "referenced_type" : "type-2910",
    "self_type" : "type-2909",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2036",
-   "self_type" : "type-2035",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2505",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2651",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26810,8 +26762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26820,8 +26772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26830,8 +26782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26840,8 +26792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26850,8 +26802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26860,8 +26812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26870,8 +26822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2438",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26880,8 +26832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2604",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26890,8 +26842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26900,8 +26852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2877",
+   "self_type" : "type-2876",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26910,8 +26862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26920,8 +26872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26930,8 +26882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26940,8 +26892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26950,8 +26902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26960,8 +26912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26970,8 +26922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26980,8 +26932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2730",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26990,8 +26942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2890",
-   "self_type" : "type-2889",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27000,8 +26952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27010,8 +26962,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27020,8 +26972,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-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27030,8 +26982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27050,8 +27002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27060,8 +27012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27070,8 +27022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27080,8 +27032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27090,8 +27042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27100,8 +27052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27110,8 +27062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27120,8 +27072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27130,8 +27082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27140,8 +27092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27150,8 +27102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27160,8 +27112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27170,8 +27122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27180,8 +27132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2465",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2433",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27190,8 +27142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -27200,8 +27152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2765",
-   "self_type" : "type-2764",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27210,8 +27162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27220,8 +27172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27230,8 +27182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27239,16 +27191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -27256,18 +27200,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2952",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2925",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27276,8 +27228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27286,8 +27238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27296,8 +27248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27306,8 +27258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27316,8 +27268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27326,8 +27278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27336,8 +27288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3103",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27356,8 +27308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27366,8 +27318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27376,8 +27328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27386,8 +27338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3136",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27396,8 +27348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27406,8 +27358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27416,8 +27368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27426,8 +27378,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-3130",
-   "self_type" : "type-3136",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27388,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-3123",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27446,8 +27398,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27456,8 +27408,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27466,8 +27418,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27476,8 +27428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27486,8 +27438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27496,8 +27448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27506,8 +27458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27516,8 +27468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27526,8 +27478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27536,8 +27488,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27498,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-566",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27556,8 +27508,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3116",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27566,8 +27518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27576,8 +27528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27586,8 +27538,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27596,8 +27548,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27606,28 +27558,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27636,8 +27578,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27646,8 +27588,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27656,8 +27598,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27666,8 +27608,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27676,8 +27618,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1813",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27686,8 +27628,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2943",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2917",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -27696,8 +27638,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1796",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27706,8 +27648,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27716,8 +27658,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27668,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27736,8 +27678,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27746,8 +27688,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27756,8 +27698,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-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2714",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27766,8 +27708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -27776,8 +27718,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27786,8 +27728,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27796,8 +27738,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-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27806,8 +27748,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-2247",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27816,18 +27758,38 @@
    "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-2737",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2711",
+   "self_type" : "type-2710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27837,7 +27799,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27846,8 +27808,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27856,8 +27818,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1801",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27865,8 +27827,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -27874,8 +27836,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -27903,13 +27865,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1907",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -27935,18 +27897,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2096",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -27977,18 +27939,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1993",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -28019,23 +27981,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -28061,17 +28023,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -28081,13 +28043,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2453",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -28113,13 +28075,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2553"
+     "referenced_type" : "type-2528"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -28145,28 +28107,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -28192,13 +28154,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -28224,17 +28186,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -28254,12 +28216,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -28284,8 +28246,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -28316,13 +28278,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -28358,13 +28320,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -28415,8 +28377,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -28447,12 +28409,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -28462,8 +28424,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -28489,7 +28451,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -28504,7 +28466,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -28519,13 +28481,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1739"
+     "referenced_type" : "type-1720"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -28551,13 +28513,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1938",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -28583,13 +28545,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2644",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -28615,47 +28577,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -28670,13 +28632,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2515",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -28702,12 +28664,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "nStereoWidening",
@@ -28717,8 +28679,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -28744,18 +28706,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -28781,18 +28743,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -28853,23 +28815,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2387"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -28910,8 +28872,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -28947,23 +28909,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2480"
+     "referenced_type" : "type-2492"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2488"
+     "referenced_type" : "type-2499"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2469"
+     "referenced_type" : "type-2487"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -28994,12 +28956,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29014,23 +28976,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -29071,8 +29033,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -29103,28 +29065,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2440"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -29155,13 +29117,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2453"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -29192,18 +29154,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2472"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2482",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -29229,18 +29191,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-3017",
-   "self_type" : "type-3017",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3001",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -29266,18 +29228,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -29303,18 +29265,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2515",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -29350,23 +29312,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -29397,23 +29359,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -29459,18 +29421,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -29501,17 +29463,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -29526,18 +29488,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -29568,18 +29530,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -29610,18 +29572,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -29652,18 +29614,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -29694,13 +29656,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -29731,7 +29693,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29746,8 +29708,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -29783,7 +29745,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29798,8 +29760,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -29860,13 +29822,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2412"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -29922,23 +29884,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2414"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -29969,12 +29931,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29989,23 +29951,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -30036,18 +29998,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -30078,18 +30040,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -30145,23 +30107,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -30187,7 +30149,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -30197,12 +30159,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2400"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nSamplingRate",
@@ -30212,12 +30174,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -30227,8 +30189,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -30239,28 +30201,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -30271,23 +30233,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -30313,8 +30275,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -30335,7 +30297,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -30355,32 +30317,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -30390,7 +30352,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -30410,8 +30372,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -30422,23 +30384,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -30449,18 +30411,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -30481,108 +30443,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -30608,12 +30570,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -30628,13 +30590,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2671"
+     "referenced_type" : "type-2644"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2643",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -30645,27 +30607,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2663"
+     "referenced_type" : "type-2636"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2665"
+     "referenced_type" : "type-2638"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -30676,23 +30638,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -30728,8 +30690,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-3114",
-   "self_type" : "type-3114",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3088",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -30750,13 +30712,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -30787,8 +30749,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-3101",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3078",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -30814,12 +30776,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -30829,8 +30791,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -30861,13 +30823,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2961"
+     "referenced_type" : "type-2935"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2963",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2936",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -30893,18 +30855,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2713"
+     "referenced_type" : "type-2696"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2715"
+     "referenced_type" : "type-2698"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2712",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2695",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -30930,7 +30892,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -30945,8 +30907,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2926",
+   "self_type" : "type-2926",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -30982,8 +30944,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2932",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -31004,7 +30966,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31019,8 +30981,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -31041,7 +31003,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31061,18 +31023,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -31098,13 +31060,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-3094",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3071",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -31130,13 +31092,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -31162,13 +31124,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3061"
+     "referenced_type" : "type-3038"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3073",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3050",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -31194,12 +31156,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -31209,7 +31171,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -31219,7 +31181,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -31229,13 +31191,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -31261,53 +31223,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -31338,8 +31300,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -31365,13 +31327,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3029",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3014",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -31397,13 +31359,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3122",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3100",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -31429,13 +31391,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2933"
+     "referenced_type" : "type-2912"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2944",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2918",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -31461,13 +31423,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -31493,13 +31455,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-3144",
-   "self_type" : "type-3144",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3119",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -31530,13 +31492,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -31562,13 +31524,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -31589,7 +31551,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31604,8 +31566,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -31626,7 +31588,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31641,12 +31603,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -31656,17 +31618,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -31681,13 +31643,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -31713,13 +31675,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2977"
+     "referenced_type" : "type-2956"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2989",
-   "self_type" : "type-2989",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -31755,8 +31717,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3150",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3124",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -31782,18 +31744,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2998",
-   "self_type" : "type-2998",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2980",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -31819,12 +31781,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -31839,8 +31801,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-3007",
-   "self_type" : "type-3007",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2990",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -31866,13 +31828,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2969",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2946",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -31898,13 +31860,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3134",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3110",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -31930,18 +31892,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2888",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2872",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -31967,13 +31929,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-3152"
+     "referenced_type" : "type-3126"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3153",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3127",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -31999,13 +31961,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3041"
+     "referenced_type" : "type-3027"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3028",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -32041,8 +32003,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2964",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2937",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -32068,7 +32030,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -32083,8 +32045,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -32110,13 +32072,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -32142,23 +32104,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -32189,18 +32151,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -32231,8 +32193,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -32258,18 +32220,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -32280,12 +32242,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -32300,7 +32262,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -32310,28 +32272,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -32342,18 +32304,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -32379,13 +32341,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -32406,13 +32368,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -32433,8 +32395,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -32460,7 +32422,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2091"
+     "referenced_type" : "type-2071"
     },
     {
      "field_name" : "nDataSize",
@@ -32470,13 +32432,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -32507,13 +32469,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -32524,13 +32486,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -32556,13 +32518,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -32583,13 +32545,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -32610,13 +32572,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -32637,13 +32599,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -32706,13 +32668,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3018",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3002",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -32738,58 +32700,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -32815,7 +32777,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -32825,8 +32787,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3125",
+   "self_type" : "type-3125",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -32857,8 +32819,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -32879,12 +32841,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -32894,7 +32856,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -32904,18 +32866,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -32941,7 +32903,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -32961,27 +32923,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -32991,8 +32953,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -33003,27 +32965,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -33054,18 +33016,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-2937"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3060",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -33086,13 +33048,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -33113,13 +33075,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -33150,8 +33112,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -33182,8 +33144,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -33214,8 +33176,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -33236,13 +33198,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -33263,13 +33225,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -33290,17 +33252,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -33310,8 +33272,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -33337,23 +33299,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -33374,13 +33336,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -33401,13 +33363,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -33433,13 +33395,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -33465,38 +33427,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -33512,13 +33474,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -33604,8 +33566,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -33631,7 +33593,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33646,18 +33608,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33693,8 +33655,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -33725,8 +33687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -33757,8 +33719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -33784,7 +33746,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -33809,8 +33771,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -33836,7 +33798,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -33851,7 +33813,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33866,18 +33828,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33908,7 +33870,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -33918,7 +33880,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -33933,8 +33895,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -33970,13 +33932,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -34017,7 +33979,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -34037,32 +33999,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34072,22 +34034,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -34097,17 +34059,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -34117,13 +34079,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -34149,17 +34111,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -34181,8 +34143,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -34208,12 +34170,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -34223,12 +34185,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -34270,17 +34232,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34290,7 +34252,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -34305,8 +34267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -34332,12 +34294,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -34347,8 +34309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -34374,7 +34336,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -34394,8 +34356,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -34421,33 +34383,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -34483,7 +34445,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -34493,8 +34455,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -34525,12 +34487,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -34550,7 +34512,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -34565,12 +34527,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34585,13 +34547,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -34622,12 +34584,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -34637,8 +34599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -34679,8 +34641,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -34721,8 +34683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -34748,22 +34710,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -34788,23 +34750,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -34830,43 +34792,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -34892,7 +34854,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -34912,8 +34874,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -34939,12 +34901,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -34954,13 +34916,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -34986,17 +34948,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -35011,13 +34973,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -35043,13 +35005,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -35060,12 +35022,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -35080,7 +35042,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -35100,28 +35062,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -35132,18 +35094,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -35169,18 +35131,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -35206,18 +35168,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -35243,38 +35205,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -35284,7 +35246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35293,13 +35255,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -35323,19 +35285,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -35374,8 +35336,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-3087",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3061",
    "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"
@@ -35384,8 +35346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -35395,7 +35357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35404,19 +35366,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -35428,13 +35390,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -35478,7 +35440,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35487,55 +35449,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -35577,18 +35539,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -35598,7 +35560,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35613,25 +35575,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -35642,8 +35604,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -35685,12 +35647,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -35700,13 +35662,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -35717,11 +35679,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -35729,35 +35691,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -35768,28 +35730,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -35799,7 +35761,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35808,25 +35770,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3091",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3064",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -35868,7 +35830,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -35885,8 +35847,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -35896,7 +35858,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -35905,20 +35867,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -36039,20 +36001,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36247,20 +36209,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36488,20 +36450,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -36753,20 +36715,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -36958,20 +36920,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2686"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2717",
-   "self_type" : "type-2717",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2685",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2686" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -37123,20 +37085,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2684"
+     "referenced_type" : "type-2652"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2706",
-   "self_type" : "type-2706",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2684" ],
+   "template_args" : [ "type-2652" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -37304,20 +37266,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -37485,20 +37447,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -37721,20 +37683,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -37886,20 +37848,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -38081,14 +38043,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2717"
+     "referenced_type" : "type-2685"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2716",
-   "self_type" : "type-2716",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -38245,14 +38207,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2706"
+     "referenced_type" : "type-2670"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2705",
-   "self_type" : "type-2705",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2669",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -38426,7 +38388,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -38435,26 +38397,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -38543,28 +38505,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -38573,8 +38535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3096",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3069",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -38583,8 +38545,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -38596,14 +38558,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -38629,7 +38591,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -38639,13 +38601,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2929",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -38671,12 +38633,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -38691,13 +38653,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2957",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2930",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -38718,7 +38680,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38743,18 +38705,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -38775,7 +38737,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38800,18 +38762,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -38847,13 +38809,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2933",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -38879,13 +38841,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2934"
+     "referenced_type" : "type-2901"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2958",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2931",
+   "self_type" : "type-2931",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -38911,13 +38873,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2939",
+   "referenced_type" : "type-2913",
+   "self_type" : "type-2913",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -38927,11 +38889,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -38939,11 +38901,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -38951,11 +38913,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -38963,11 +38925,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -38975,11 +38937,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -38987,11 +38949,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -38999,11 +38961,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -39011,11 +38973,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -39023,8 +38985,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -39055,8 +39017,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2953",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2927",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -39067,17 +39029,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2935"
+     "referenced_type" : "type-2902"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2936"
+     "referenced_type" : "type-2903"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2901",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -39088,15 +39050,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2937"
+     "referenced_type" : "type-2904"
     }
    ],
    "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-2936",
-   "self_type" : "type-2936",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2903",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -39107,18 +39069,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2938",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2905",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -39129,48 +39091,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2937",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2904",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -39181,14 +39143,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -39317,14 +39279,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -39405,14 +39367,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -39492,14 +39454,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -39586,14 +39548,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -39696,13 +39658,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -39752,17 +39714,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -39772,17 +39734,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39792,17 +39754,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -39812,17 +39774,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39832,17 +39794,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -39852,17 +39814,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -39872,17 +39834,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -39892,17 +39854,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -39912,17 +39874,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -39932,14 +39894,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -39950,11 +39912,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -39962,11 +39924,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -39974,11 +39936,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -39986,11 +39948,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -39998,17 +39960,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -40016,17 +39978,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -40036,17 +39998,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -40056,17 +40018,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -40076,29 +40038,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2116"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2139" ],
+   "template_args" : [ "type-2117" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -40106,18 +40068,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -40127,50 +40089,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -40179,17 +40141,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -40198,17 +40160,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -40219,26 +40181,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -40251,26 +40213,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -40283,17 +40245,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -40322,17 +40284,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -40361,17 +40323,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -40400,18 +40362,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -40419,15 +40381,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -40439,17 +40401,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -40478,17 +40440,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -40515,100 +40477,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -40618,7 +40496,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -40628,29 +40506,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -40660,18 +40548,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -40682,23 +40570,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -40709,7 +40597,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40734,13 +40622,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -40751,7 +40639,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40781,13 +40669,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -40803,12 +40691,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -40823,8 +40711,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -40860,8 +40748,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -40873,14 +40761,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -40892,14 +40780,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2077"
+     "referenced_type" : "type-2055"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2076",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -40909,7 +40797,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -40918,20 +40806,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -40941,7 +40829,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -40950,44 +40838,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -41022,11 +40904,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -41035,61 +40940,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41101,25 +41006,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -41131,127 +41036,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -41476,8 +41381,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -41486,8 +41391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -41531,14 +41436,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -41580,13 +41485,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -41610,7 +41515,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -41634,13 +41539,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41652,31 +41557,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -41688,8 +41593,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -41702,13 +41607,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -41720,14 +41625,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -41738,8 +41643,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -41775,14 +41680,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -41792,14 +41697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -41809,8 +41714,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -41862,7 +41767,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -41877,8 +41782,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2948",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2922",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -41899,13 +41804,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2928",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -41917,14 +41822,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2095"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2094",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -41936,14 +41841,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -41955,14 +41860,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -41975,14 +41880,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -42022,8 +41927,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -42033,8 +41938,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -42044,8 +41949,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -42069,7 +41974,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -42078,17 +41983,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2800",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2833" ],
+   "template_args" : [ "type-2801" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -42283,7 +42188,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -42292,17 +42197,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2772",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2810" ],
+   "template_args" : [ "type-2773" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -42532,14 +42437,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -42549,11 +42454,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2724",
-   "self_type" : "type-2724",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2725" ],
+   "template_args" : [ "type-2694" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -42561,13 +42466,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -42608,17 +42513,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -42666,17 +42571,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -42724,17 +42629,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -42782,17 +42687,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42840,17 +42745,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -42898,17 +42803,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42956,17 +42861,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -43014,17 +42919,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43072,17 +42977,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43130,17 +43035,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -43188,17 +43093,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -43246,17 +43151,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -43303,14 +43208,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -43382,13 +43287,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2940",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2914",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -43400,14 +43305,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -43419,14 +43324,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -43437,7 +43342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43446,62 +43351,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1798"
+     "referenced_type" : "type-1776"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2156"
+     "referenced_type" : "type-2130"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -43606,23 +43511,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2951"
+     "referenced_type" : "type-2924"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2950",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2923",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -43633,17 +43538,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -43688,17 +43593,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -43743,17 +43648,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -43800,7 +43705,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -43812,20 +43717,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -43877,13 +43782,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2941"
+     "referenced_type" : "type-2915"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2919",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -43894,18 +43799,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2942"
+     "referenced_type" : "type-2916"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2941",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2915",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -43916,18 +43821,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2921",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -43938,23 +43843,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2920",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -43964,14 +43869,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2115"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -43998,8 +43903,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3058",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -44008,8 +43913,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3057",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -44018,85 +43923,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44107,13 +44012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3083"
+     "referenced_type" : "type-3056"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3055",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -44123,13 +44028,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3072"
+     "referenced_type" : "type-3045"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3071",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3044",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -44139,13 +44044,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3070"
+     "referenced_type" : "type-3043"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3069",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3042",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44155,13 +44060,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3067"
+     "referenced_type" : "type-3041"
     }
    ],
    "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-3066",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3040",
    "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"
@@ -44171,13 +44076,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3065"
+     "referenced_type" : "type-3037"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3036",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44187,13 +44092,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3058"
+     "referenced_type" : "type-3031"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44203,13 +44108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3060"
+     "referenced_type" : "type-3033"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3032",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44219,13 +44124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3079"
+     "referenced_type" : "type-3052"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3051",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44235,13 +44140,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3077"
+     "referenced_type" : "type-3049"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3076",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3048",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44251,13 +44156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3081"
+     "referenced_type" : "type-3054"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3080",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3053",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -44267,13 +44172,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3063"
+     "referenced_type" : "type-3035"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3062",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3034",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44283,13 +44188,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3075"
+     "referenced_type" : "type-3047"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3046",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -44298,8 +44203,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -44310,21 +44215,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -44333,21 +44238,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -44356,21 +44261,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -44379,21 +44284,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -44402,21 +44307,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -44425,21 +44330,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -44448,21 +44353,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -44471,21 +44376,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -44494,21 +44399,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -44517,21 +44422,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -44540,21 +44445,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -44563,21 +44468,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -44587,14 +44492,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -44606,14 +44511,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -44625,14 +44530,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -44644,14 +44549,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -44663,17 +44568,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -44683,26 +44588,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -44712,7 +44617,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2643"
+     "referenced_type" : "type-2626"
     }
    ],
    "fields" :
@@ -44720,13 +44625,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -44894,7 +44799,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -44902,13 +44807,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -45121,7 +45026,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -45129,13 +45034,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -45291,10 +45196,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -45303,44 +45208,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -45404,7 +45309,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -45439,11 +45344,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -45477,7 +45382,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -45486,31 +45391,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -45631,7 +45536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -45639,18 +45544,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -45792,7 +45697,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2565"
+     "referenced_type" : "type-2540"
     }
    ],
    "fields" :
@@ -45800,13 +45705,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2539",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -45930,7 +45835,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -45938,13 +45843,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -46107,7 +46012,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -46115,13 +46020,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -46233,16 +46138,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2992"
+     "referenced_type" : "type-2964"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2991",
-   "self_type" : "type-2991",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2963",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46250,271 +46155,271 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2995"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2994",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2994"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2993",
-   "self_type" : "type-2993",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2996"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2995",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2993"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2992",
-   "self_type" : "type-2992",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2997"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2996",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2986"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2985",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2985"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2984",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2987"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2986",
-   "self_type" : "type-2986",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2984"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2983",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2988"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2987",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2971"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2970",
-   "self_type" : "type-2970",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2972"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2971",
-   "self_type" : "type-2971",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2974"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2973",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2975"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2974",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2976"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2975",
-   "self_type" : "type-2975",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2967"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2966",
    "self_type" : "type-2966",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2968" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2966"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2965",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2968"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2967",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2965"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2964",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2969"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2968",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2960"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2959",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2959"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2958",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2961"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2960",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2958"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2957",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2962"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2961",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2944"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2943",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2945"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2944",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2948"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2947",
+   "self_type" : "type-2947",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2949"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2948",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2950"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2949",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2940"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2939",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2941" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -46522,16 +46427,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3001"
+     "referenced_type" : "type-2974"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-3000",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46539,16 +46444,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3000"
+     "referenced_type" : "type-2973"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2999",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2972",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46556,16 +46461,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3004"
+     "referenced_type" : "type-2977"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3003",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2976",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46573,16 +46478,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3003"
+     "referenced_type" : "type-2976"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3002",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2975",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46590,16 +46495,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3005"
+     "referenced_type" : "type-2978"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2977",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46607,16 +46512,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3002"
+     "referenced_type" : "type-2975"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2974",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46624,16 +46529,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3006"
+     "referenced_type" : "type-2979"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3005",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2978",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -46641,16 +46546,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3011"
+     "referenced_type" : "type-2984"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3010",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2983",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46658,16 +46563,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3010"
+     "referenced_type" : "type-2983"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2982",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46675,16 +46580,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3009"
+     "referenced_type" : "type-2982"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3008",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2981",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46692,16 +46597,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3014"
+     "referenced_type" : "type-2987"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2986",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46709,16 +46614,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3013"
+     "referenced_type" : "type-2986"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3012",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2985",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46726,16 +46631,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3015"
+     "referenced_type" : "type-2988"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3014",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2987",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46743,16 +46648,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3012"
+     "referenced_type" : "type-2985"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2984",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46760,101 +46665,101 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-2989"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<float>",
+   "name" : "android::is_one_of<float>",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2988",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-94" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3021"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3020",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3020"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3019",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3019"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3018",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3018"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3017",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-3016"
     }
    ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3015",
    "self_type" : "type-3015",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3049"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3048",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3048"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3047",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3047"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3046",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3046"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3045",
-   "self_type" : "type-3045",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3044"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3043",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46862,16 +46767,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3052"
+     "referenced_type" : "type-3024"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3051",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3023",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46879,270 +46784,270 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3051"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3050",
-   "self_type" : "type-3050",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3053"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3052",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3045"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3044",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3050"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3049",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3054"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3053",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3035"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3034",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3034"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3033",
-   "self_type" : "type-3033",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3033"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3032",
-   "self_type" : "type-3032",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3032"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3031",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3038"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3037",
-   "self_type" : "type-3037",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3037"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3036",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3039"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3038",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3031"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3030",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3036"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3035",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3040"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3039",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-3023"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3022",
    "self_type" : "type-3022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3025"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3024",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3017"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3016",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3022"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3021",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3026"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3025",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3008"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3007",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3007"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3006",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3006"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3005",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3005"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3004",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3011"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3010",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3010"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3009",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3012"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3011",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3004"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3003",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3009"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3008",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3013"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3012",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2995"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2994",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -47151,13 +47056,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3022"
+     "referenced_type" : "type-2994"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47168,13 +47073,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3021"
+     "referenced_type" : "type-2993"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3020",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2992",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47185,13 +47090,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3020"
+     "referenced_type" : "type-2992"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47202,13 +47107,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3026"
+     "referenced_type" : "type-2998"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47219,13 +47124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3025"
+     "referenced_type" : "type-2997"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3024",
-   "self_type" : "type-3024",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2996",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47236,13 +47141,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3027"
+     "referenced_type" : "type-2999"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2998",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47253,13 +47158,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3024"
+     "referenced_type" : "type-2996"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3023",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2995",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47270,13 +47175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3028"
+     "referenced_type" : "type-3000"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-3027",
-   "self_type" : "type-3027",
+   "referenced_type" : "type-2999",
+   "self_type" : "type-2999",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47287,16 +47192,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2980"
+     "referenced_type" : "type-2953"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2979",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2952",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47304,16 +47209,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2979"
+     "referenced_type" : "type-2952"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2978",
-   "self_type" : "type-2978",
+   "referenced_type" : "type-2951",
+   "self_type" : "type-2951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47321,16 +47226,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2981"
+     "referenced_type" : "type-2954"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2980",
-   "self_type" : "type-2980",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2953",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -47338,16 +47243,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2982"
+     "referenced_type" : "type-2955"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2981",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2954",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -47356,7 +47261,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -47366,11 +47271,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -47379,21 +47284,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47402,21 +47307,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -47425,21 +47330,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47448,21 +47353,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -47471,21 +47376,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -47499,16 +47404,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -47527,8 +47432,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -47541,17 +47446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -47561,17 +47466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -47581,17 +47486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -47601,17 +47506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -47621,17 +47526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -47641,17 +47546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -47661,17 +47566,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -47681,17 +47586,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -47701,17 +47606,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -47721,318 +47626,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
    "alignment" : 4,
@@ -48041,18 +47646,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-662"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
    "alignment" : 4,
@@ -48061,18 +47666,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-259"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
-   "name" : "android::sp<android::OMXNodeInstance>",
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
    "alignment" : 4,
@@ -48081,18 +47686,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
-   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
    "alignment" : 4,
@@ -48101,18 +47706,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2157"
+     "referenced_type" : "type-802"
     }
    ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2158" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
    "alignment" : 4,
@@ -48121,18 +47726,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3131"
+     "referenced_type" : "type-641"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3130",
-   "self_type" : "type-3130",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3133" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
    "alignment" : 4,
@@ -48141,78 +47746,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3124"
+     "referenced_type" : "type-438"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-3123",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3126" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "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-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
-    }
-   ],
-   "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-56",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
    "alignment" : 4,
@@ -48224,14 +47769,374 @@
      "referenced_type" : "type-3139"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
    "record_kind" : "class",
    "referenced_type" : "type-3138",
    "self_type" : "type-3138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3141" ],
+   "template_args" : [ "type-2686" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-125"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-127" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-824"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
+   "name" : "android::sp<android::OMXNodeInstance>",
+   "record_kind" : "class",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-825" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-797"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
+   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-794" ],
+   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Thread>",
+   "name" : "android::sp<android::Thread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2132" ],
+   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3105"
+    }
+   ],
+   "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-3104",
+   "self_type" : "type-3104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3107" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3097"
+    }
+   ],
+   "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-3096",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3099" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-40"
+    }
+   ],
+   "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-39",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-42" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-33"
+    }
+   ],
+   "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-32",
+   "self_type" : "type-32",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-476" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3113"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3115" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -48241,17 +48146,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -48261,17 +48166,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -48281,17 +48186,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -48301,17 +48206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -48321,17 +48226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -48341,17 +48246,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -48361,17 +48266,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -48381,223 +48286,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3111"
+     "referenced_type" : "type-3085"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3110",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3113" ],
+   "template_args" : [ "type-3087" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48607,283 +48512,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -48893,8 +48798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48904,327 +48809,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1686",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49234,8 +49139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49245,327 +49150,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1680",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1735",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1691",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49575,8 +49480,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49586,338 +49491,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1683",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-1876",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49927,8 +49832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49938,250 +49843,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1661",
+   "self_type" : "type-1661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -50192,16 +50097,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -50209,16 +50114,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -50226,16 +50131,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -50243,16 +50148,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -50260,16 +50165,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -50277,16 +50182,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-1748"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50294,16 +50199,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -50311,16 +50216,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1769"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50328,16 +50233,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -50345,16 +50250,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -50362,16 +50267,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -50379,16 +50284,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -50398,23 +50303,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -50424,23 +50329,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -50450,23 +50355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -50476,23 +50381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -50502,23 +50407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -50528,23 +50433,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -50553,18 +50458,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2017",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -50580,18 +50485,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1996"
+     "referenced_type" : "type-1984"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -50602,7 +50507,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-1954"
     },
     {
      "field_name" : "num_planes",
@@ -50612,13 +50517,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1981"
+     "referenced_type" : "type-1964"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -50629,48 +50534,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1970"
+     "referenced_type" : "type-1942"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -50681,38 +50586,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -50723,18 +50628,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -50745,17 +50650,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -50775,13 +50680,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -50791,13 +50696,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -50808,35 +50713,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -50857,8 +50762,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -50869,43 +50774,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -50916,32 +50821,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -50951,13 +50856,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -50968,32 +50873,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -51003,13 +50908,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -51020,17 +50925,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -51060,13 +50965,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -51077,28 +50982,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -51110,8 +51015,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -51119,8 +51024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -51128,8 +51033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51137,8 +51042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51146,8 +51051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51155,8 +51060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51164,8 +51069,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/32/x86/source-based/libstagefright_softomx.so.lsdump b/Q/32/x86/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 879ce36..0000000
--- a/Q/32/x86/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28465 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "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-447",
-   "self_type" : "type-448",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 1792,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-759",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-536",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-537",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-634",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-635",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-631",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-768",
-   "return_type" : "type-30",
-   "self_type" : "type-768",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-733",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-790"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-793"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-680"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-939"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-722",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-700",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-708",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-679",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-724",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-962",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-822",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-639",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-426",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-685",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-918",
-   "self_type" : "type-920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-711",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-690",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-936",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-768",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-683",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-681",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-679",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-932",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-787",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-454",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-711",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-731",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-439",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-938",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-953",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-690",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-696",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-702",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-687",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-922",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-729",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-979",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-618",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-741",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-428",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-424",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-766",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-511"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-465"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-463"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-460"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-485"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-487"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-484"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-478"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-480"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-482"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-505"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-506"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-461"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-443"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-442"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-459"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-469"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-470"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 416,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-535"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-537"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-571"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-555"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-539"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-547"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-622"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-632"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-634"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-635"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-629"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-450"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-568"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-569"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-577"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-642"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-643"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-637"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-641"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-605"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-606"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-581"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-583"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-591"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-592"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-584"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-595"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-596"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-598"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-599"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-603"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-601"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-915",
-   "self_type" : "type-915",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 1828,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-519"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-520" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-712"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-774"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-971"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-763"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-518"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-897"
-    }
-   ],
-   "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-896",
-   "self_type" : "type-896",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-888"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-887",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-908"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-825"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-828"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-827"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-829"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-818"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-820"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-817"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-800"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-803" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-801"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-802" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-807"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-808"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-797"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-798" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-833"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-832"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-835"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-834"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-843"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-842"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-846"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-845"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-849"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-878"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-877",
-   "self_type" : "type-877",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-870"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-869"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-871"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-863"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-852"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-857"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-856"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-812"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-811",
-   "self_type" : "type-811",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-813"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-814"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-764"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-765" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-932" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-985",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-940",
-   "self_type" : "type-940",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-861",
-   "self_type" : "type-861",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-636",
-   "self_type" : "type-636",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-959",
-   "self_type" : "type-959",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-677",
-   "self_type" : "type-677",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-750",
-   "self_type" : "type-750",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-755"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-757"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-753"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-729",
-   "self_type" : "type-935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/32/x86/source-based/libstagefright_xmlparser.so.lsdump b/Q/32/x86/source-based/libstagefright_xmlparser.so.lsdump
index cb952d2..52edd3d 100644
--- a/Q/32/x86/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -37,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
@@ -46,8 +26,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -56,66 +36,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -130,19 +155,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -150,6 +195,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -214,6 +271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -234,11 +295,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -246,7 +343,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -254,6 +375,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -269,389 +402,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -661,10 +483,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -674,10 +496,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -687,10 +509,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -700,24 +522,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -727,10 +535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -740,24 +548,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -767,37 +561,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -805,10 +581,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -816,8 +601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -825,8 +610,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -838,7 +632,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -846,8 +640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -855,35 +649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -896,8 +663,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -905,8 +672,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -915,19 +682,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -935,8 +702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -955,8 +722,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -969,92 +746,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1062,7 +755,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1072,39 +765,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1114,18 +817,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1136,23 +839,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f8e5bdf..3806daf 100644
--- a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,16 +5,16 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
   {
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE []",
    "name" : "OMX_COMPONENTREGISTERTYPE []",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1516",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-1475",
+   "self_type" : "type-2204",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -89,8 +89,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -108,7 +108,7 @@
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1372",
+   "self_type" : "type-1528",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1584",
+   "self_type" : "type-2313",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1376",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1585",
+   "self_type" : "type-2314",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1451",
+   "self_type" : "type-2180",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1581",
+   "self_type" : "type-2310",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -246,8 +246,8 @@
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2918",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 16
   },
   {
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -3155,8 +3152,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3209,8 +3206,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3307,8 +3304,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3353,8 +3350,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3403,8 +3400,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3453,8 +3450,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3495,8 +3492,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3561,8 +3558,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1638",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3703,8 +3700,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3745,8 +3742,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3783,8 +3780,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1810",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3829,8 +3826,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3871,8 +3868,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3929,8 +3926,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3983,8 +3980,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4025,8 +4022,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4071,8 +4068,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4109,8 +4106,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4147,8 +4144,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1634",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4205,8 +4202,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4239,8 +4236,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4273,8 +4270,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4315,8 +4312,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4357,8 +4354,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4421,8 +4418,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4475,8 +4472,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4717,8 +4714,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4763,8 +4760,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4801,8 +4798,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4843,8 +4840,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4869,8 +4866,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4911,8 +4908,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4937,8 +4934,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5115,8 +5112,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5189,8 +5186,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5255,8 +5252,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5289,8 +5286,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5335,8 +5332,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5405,8 +5402,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5471,8 +5468,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5521,8 +5518,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5563,8 +5560,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5613,8 +5610,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5655,8 +5652,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -6353,8 +6350,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -6515,8 +6512,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6557,8 +6554,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6595,8 +6592,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6633,8 +6630,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6675,8 +6672,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6705,8 +6702,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -6751,8 +6748,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6793,8 +6790,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6843,8 +6840,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6874,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6911,8 +6908,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6949,8 +6946,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6987,8 +6984,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7021,8 +7018,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7059,8 +7056,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7113,8 +7110,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7219,8 +7216,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7257,8 +7254,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7311,8 +7308,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-1552",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7349,8 +7346,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7431,8 +7428,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7481,8 +7478,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7539,8 +7536,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7601,8 +7598,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7639,8 +7636,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7681,8 +7678,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7727,8 +7724,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7777,8 +7774,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7843,8 +7840,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7933,8 +7930,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7991,8 +7988,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8033,8 +8030,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8075,8 +8072,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8141,8 +8138,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8183,8 +8180,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8287,8 +8284,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8333,8 +8330,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8363,8 +8360,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8487,8 +8484,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8711,8 +8708,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-92",
@@ -8795,8 +8792,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8847,8 +8844,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8925,8 +8922,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8943,8 +8940,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8969,8 +8966,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4047",
-   "self_type" : "type-4047",
+   "referenced_type" : "type-4707",
+   "self_type" : "type-4707",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9011,8 +9008,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3997",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9147,8 +9144,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12141,8 +12138,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12161,9 +12158,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1368",
-   "return_type" : "type-1365",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1506",
+   "return_type" : "type-1498",
+   "self_type" : "type-1506",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12176,12 +12173,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1655",
-   "return_type" : "type-1365",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1498",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12194,7 +12191,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12206,9 +12203,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-1651",
-   "return_type" : "type-1365",
-   "self_type" : "type-1651",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1498",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12221,7 +12218,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12236,9 +12233,9 @@
      "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-1648",
-   "return_type" : "type-1365",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-2377",
+   "return_type" : "type-1498",
+   "self_type" : "type-2377",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12251,7 +12248,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12263,9 +12260,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1660",
-   "return_type" : "type-1365",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1498",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12278,15 +12275,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1657",
-   "return_type" : "type-1365",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-2386",
+   "return_type" : "type-1498",
+   "self_type" : "type-2386",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12299,7 +12296,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1486"
     },
     {
      "referenced_type" : "type-2"
@@ -12308,9 +12305,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1635",
-   "return_type" : "type-1365",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1498",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12323,15 +12320,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1485"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1637",
-   "return_type" : "type-1365",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1498",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12344,12 +12341,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-2372"
     }
    ],
-   "referenced_type" : "type-1642",
-   "return_type" : "type-1365",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-2371",
+   "return_type" : "type-1498",
+   "self_type" : "type-2371",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12365,12 +12362,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-2369"
     }
    ],
-   "referenced_type" : "type-1639",
-   "return_type" : "type-1365",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-2368",
+   "return_type" : "type-1498",
+   "self_type" : "type-2368",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12386,18 +12383,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-2362"
     }
    ],
-   "referenced_type" : "type-1631",
-   "return_type" : "type-1365",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-2360",
+   "return_type" : "type-1498",
+   "self_type" : "type-2360",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12416,9 +12413,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-1662",
-   "return_type" : "type-1365",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-2391",
+   "return_type" : "type-1498",
+   "self_type" : "type-2391",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12434,12 +12431,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1653",
-   "return_type" : "type-1365",
-   "self_type" : "type-1653",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1498",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12461,12 +12458,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-2375"
     }
    ],
-   "referenced_type" : "type-1645",
-   "return_type" : "type-1365",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-2374",
+   "return_type" : "type-1498",
+   "self_type" : "type-2374",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12482,12 +12479,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1384",
-   "return_type" : "type-1365",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1498",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12503,7 +12500,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1590"
     },
     {
      "referenced_type" : "type-2"
@@ -12515,9 +12512,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1382",
-   "return_type" : "type-1365",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1593",
+   "return_type" : "type-1498",
+   "self_type" : "type-1593",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12551,15 +12548,15 @@
      "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2847"
+     "referenced_type" : "type-1389"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2845",
+   "referenced_type" : "type-1388",
    "return_type" : "type-95",
-   "self_type" : "type-2845",
+   "self_type" : "type-1388",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12614,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2839"
+     "referenced_type" : "type-1382"
     },
     {
      "referenced_type" : "type-99"
@@ -12632,9 +12629,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2838",
+   "referenced_type" : "type-1381",
    "return_type" : "type-9",
-   "self_type" : "type-2838",
+   "self_type" : "type-1381",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12662,7 +12659,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-3843"
+     "referenced_type" : "type-4503"
     }
    ],
    "return_type" : "type-52",
@@ -12969,7 +12966,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2192"
     }
    ],
    "return_type" : "type-9",
@@ -13315,7 +13312,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1767"
+     "referenced_type" : "type-2494"
     },
     {
      "referenced_type" : "type-4"
@@ -13424,13 +13421,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2524"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-1807",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13440,13 +13437,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2524"
     },
     {
-     "referenced_type" : "type-1804"
+     "referenced_type" : "type-1863"
     }
    ],
-   "return_type" : "type-1807",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13457,7 +13454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-12"
@@ -13477,7 +13474,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13497,7 +13494,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13517,7 +13514,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13540,7 +13537,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13563,7 +13560,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13586,7 +13583,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13609,7 +13606,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-12"
@@ -13629,7 +13626,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13649,7 +13646,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13669,7 +13666,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13692,7 +13689,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13715,7 +13712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13738,7 +13735,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13761,7 +13758,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-12"
@@ -13781,7 +13778,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13801,7 +13798,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13821,7 +13818,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13844,7 +13841,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13867,7 +13864,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13890,7 +13887,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13912,10 +13909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
-   "return_type" : "type-1751",
+   "return_type" : "type-2478",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13925,7 +13922,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
    "return_type" : "type-570",
@@ -13938,10 +13935,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
-   "return_type" : "type-1738",
+   "return_type" : "type-2465",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13951,15 +13948,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-3081"
+     "referenced_type" : "type-1649"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4765" ]
+   "template_args" : [ "type-3128" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13968,15 +13965,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1815"
+     "referenced_type" : "type-2536"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4768" ]
+   "template_args" : [ "type-3131" ]
   },
   {
    "access" : "protected",
@@ -14250,7 +14247,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14270,7 +14267,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14290,7 +14287,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14313,7 +14310,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14336,7 +14333,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14359,7 +14356,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14396,7 +14393,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-3843"
+     "referenced_type" : "type-4503"
     }
    ],
    "return_type" : "type-52",
@@ -14419,8 +14416,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-2697",
-   "self_type" : "type-2696",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14428,8 +14425,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5770",
-   "self_type" : "type-5769",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14437,8 +14434,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6646",
-   "self_type" : "type-6645",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14446,8 +14443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14455,8 +14452,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6099",
-   "self_type" : "type-6108",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4135",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14464,8 +14461,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6908",
-   "self_type" : "type-6915",
+   "referenced_type" : "type-6712",
+   "self_type" : "type-6726",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14473,8 +14470,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2891",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14482,8 +14479,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-5934",
-   "self_type" : "type-5933",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14491,8 +14488,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6773",
-   "self_type" : "type-6772",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14500,8 +14497,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14506,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14518,8 +14515,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4014",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4674",
+   "self_type" : "type-4673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14527,8 +14524,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4278",
-   "self_type" : "type-4277",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14536,8 +14533,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6226",
-   "self_type" : "type-6225",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14542,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7069",
-   "self_type" : "type-7068",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14551,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7165",
-   "self_type" : "type-7164",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7420",
-   "self_type" : "type-7419",
+   "referenced_type" : "type-7315",
+   "self_type" : "type-7314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-3928",
-   "self_type" : "type-3927",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14581,8 +14578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7332",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14591,7 +14588,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-22",
-   "self_type" : "type-2965",
+   "self_type" : "type-1515",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14600,7 +14597,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-17",
-   "self_type" : "type-3084",
+   "self_type" : "type-1652",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14609,7 +14606,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-26",
-   "self_type" : "type-3670",
+   "self_type" : "type-4328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14618,7 +14615,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-15",
-   "self_type" : "type-3083",
+   "self_type" : "type-1651",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14627,7 +14624,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-33",
-   "self_type" : "type-3672",
+   "self_type" : "type-4330",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14636,7 +14633,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-35",
-   "self_type" : "type-3671",
+   "self_type" : "type-4329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14644,8 +14641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14653,8 +14650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-4220",
+   "self_type" : "type-4219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4022",
-   "self_type" : "type-4021",
+   "referenced_type" : "type-4682",
+   "self_type" : "type-4681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14668,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4110",
-   "self_type" : "type-4109",
+   "referenced_type" : "type-4772",
+   "self_type" : "type-4771",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6200",
-   "self_type" : "type-6199",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14689,8 +14686,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6623",
-   "self_type" : "type-6622",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14695,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6961",
-   "self_type" : "type-6960",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14707,8 +14704,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7427",
-   "self_type" : "type-7426",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14734,8 +14731,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14743,8 +14740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14752,8 +14749,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14761,44 +14758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2598",
-   "self_type" : "type-2597",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2911",
-   "self_type" : "type-2910",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14815,8 +14776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14824,8 +14785,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3730",
-   "self_type" : "type-3729",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14833,8 +14794,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14842,8 +14803,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4106",
-   "self_type" : "type-4105",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14851,8 +14812,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4890",
-   "self_type" : "type-4889",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14860,8 +14821,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5036",
-   "self_type" : "type-5035",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14869,8 +14830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5124",
-   "self_type" : "type-5123",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14878,8 +14839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5224",
-   "self_type" : "type-5223",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14887,8 +14848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5436",
-   "self_type" : "type-5435",
+   "referenced_type" : "type-4389",
+   "self_type" : "type-4388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14896,8 +14857,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14905,8 +14866,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5614",
-   "self_type" : "type-5613",
+   "referenced_type" : "type-4768",
+   "self_type" : "type-4767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14914,8 +14875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5671",
-   "self_type" : "type-5670",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14923,8 +14884,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5163",
+   "self_type" : "type-5162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14932,8 +14893,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5912",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5326",
+   "self_type" : "type-5325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14941,8 +14902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5953",
-   "self_type" : "type-5952",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14950,8 +14911,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-5605",
+   "self_type" : "type-5604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14959,8 +14920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14968,8 +14929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6343",
-   "self_type" : "type-6342",
+   "referenced_type" : "type-5773",
+   "self_type" : "type-5772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14977,8 +14938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6393",
-   "self_type" : "type-6392",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14986,8 +14947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6494",
-   "self_type" : "type-6493",
+   "referenced_type" : "type-6058",
+   "self_type" : "type-6057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14995,8 +14956,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6543",
-   "self_type" : "type-6542",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15004,8 +14965,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6657",
-   "self_type" : "type-6656",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15013,8 +14974,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6753",
-   "self_type" : "type-6752",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15022,8 +14983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6792",
-   "self_type" : "type-6791",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15031,8 +14992,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6955",
-   "self_type" : "type-6954",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15040,8 +15001,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7134",
-   "self_type" : "type-7133",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15049,8 +15010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7347",
-   "self_type" : "type-7346",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15058,8 +15019,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-6816",
+   "self_type" : "type-6815",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6988",
+   "self_type" : "type-6987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7240",
+   "self_type" : "type-7239",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7378",
+   "self_type" : "type-7377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15076,6 +15064,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7602",
+   "self_type" : "type-7601",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "type-841",
    "self_type" : "type-840",
    "size" : 8,
@@ -15157,8 +15154,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15166,8 +15163,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3648",
-   "self_type" : "type-3647",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15175,8 +15172,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4098",
-   "self_type" : "type-4097",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15184,8 +15181,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5446",
-   "self_type" : "type-5445",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15193,8 +15190,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6351",
-   "self_type" : "type-6350",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15202,8 +15199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15211,8 +15208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7480",
-   "self_type" : "type-7479",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15230,7 +15227,7 @@
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
    "referenced_type" : "type-1240",
-   "self_type" : "type-1945",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15239,7 +15236,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-123",
-   "self_type" : "type-1938",
+   "self_type" : "type-2656",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15247,8 +15244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15283,8 +15280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15292,8 +15289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15301,8 +15298,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15310,8 +15307,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2607",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1665",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15319,8 +15316,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2708",
-   "self_type" : "type-2707",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15328,8 +15325,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15337,8 +15334,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15346,8 +15343,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2975",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3706",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15355,8 +15352,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-3808",
+   "self_type" : "type-3807",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15364,8 +15361,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3690",
-   "self_type" : "type-3689",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15373,8 +15370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3827",
-   "self_type" : "type-3826",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15382,8 +15379,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-4038",
+   "self_type" : "type-4037",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15391,8 +15388,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3896",
-   "self_type" : "type-3895",
+   "referenced_type" : "type-4123",
+   "self_type" : "type-4122",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15400,8 +15397,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3936",
-   "self_type" : "type-3935",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15409,8 +15406,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4111",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15418,8 +15415,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4199",
-   "self_type" : "type-4198",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4533",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15427,8 +15424,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4790",
-   "self_type" : "type-4789",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15436,8 +15433,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4888",
-   "self_type" : "type-4887",
+   "referenced_type" : "type-4596",
+   "self_type" : "type-4595",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15445,8 +15442,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4918",
-   "self_type" : "type-4917",
+   "referenced_type" : "type-4774",
+   "self_type" : "type-4773",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15454,8 +15451,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4959",
-   "self_type" : "type-4958",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15463,17 +15460,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5032",
-   "self_type" : "type-5031",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::TextOutput &",
-   "name" : "android::TextOutput &",
-   "referenced_type" : "type-5092",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5093",
+   "self_type" : "type-5092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15490,8 +15478,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5169",
+   "self_type" : "type-5168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15499,8 +15487,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5618",
-   "self_type" : "type-5617",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15508,8 +15496,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5680",
-   "self_type" : "type-5679",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15517,8 +15505,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5720",
+   "self_type" : "type-5719",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15526,8 +15514,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5886",
-   "self_type" : "type-5885",
+   "referenced_type" : "type-5782",
+   "self_type" : "type-5781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15535,8 +15523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5959",
-   "self_type" : "type-5958",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15544,8 +15532,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6010",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15553,8 +15541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6096",
-   "self_type" : "type-6095",
+   "referenced_type" : "type-6197",
+   "self_type" : "type-6196",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15562,8 +15550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6259",
-   "self_type" : "type-6258",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6292",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15571,8 +15559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15580,8 +15568,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6420",
+   "self_type" : "type-6419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15589,8 +15577,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6552",
-   "self_type" : "type-6551",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6505",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15598,8 +15586,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15607,8 +15595,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6739",
-   "self_type" : "type-6738",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15616,8 +15604,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6799",
-   "self_type" : "type-6798",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15625,17 +15613,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6838",
-   "self_type" : "type-6837",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::TextOutput &",
-   "name" : "android::TextOutput &",
-   "referenced_type" : "type-6906",
-   "self_type" : "type-6905",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6943",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15652,8 +15631,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7226",
-   "self_type" : "type-7225",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15661,8 +15640,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7271",
-   "self_type" : "type-7270",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7176",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15670,8 +15649,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15679,8 +15658,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7341",
-   "self_type" : "type-7340",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15688,8 +15667,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7493",
-   "self_type" : "type-7492",
+   "referenced_type" : "type-7462",
+   "self_type" : "type-7461",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15697,8 +15676,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7588",
-   "self_type" : "type-7587",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7496",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7630",
+   "self_type" : "type-7629",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15733,8 +15730,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7525",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15742,8 +15739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4365",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15751,8 +15748,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15760,8 +15757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3713",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4371",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15769,8 +15766,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4500",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15778,8 +15775,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3701",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15796,8 +15793,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &",
    "name" : "android::hardware::Return<unsigned long> &",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7531",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15823,8 +15820,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15832,8 +15829,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-5896",
-   "self_type" : "type-5895",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15838,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6743",
-   "self_type" : "type-6742",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15860,7 +15857,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-382",
-   "self_type" : "type-4929",
+   "self_type" : "type-7641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15869,7 +15866,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-373",
-   "self_type" : "type-3937",
+   "self_type" : "type-4597",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15878,7 +15875,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "referenced_type" : "type-391",
-   "self_type" : "type-3692",
+   "self_type" : "type-4350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15887,7 +15884,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-3929",
+   "self_type" : "type-4589",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15896,7 +15893,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "referenced_type" : "type-360",
-   "self_type" : "type-3933",
+   "self_type" : "type-4593",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15905,7 +15902,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-385",
-   "self_type" : "type-4930",
+   "self_type" : "type-7642",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15923,7 +15920,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-453",
-   "self_type" : "type-3723",
+   "self_type" : "type-4382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15932,7 +15929,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-376",
-   "self_type" : "type-3939",
+   "self_type" : "type-4599",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15941,7 +15938,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-164",
-   "self_type" : "type-1924",
+   "self_type" : "type-2644",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15950,7 +15947,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-150",
-   "self_type" : "type-1920",
+   "self_type" : "type-2640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15959,7 +15956,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-146",
-   "self_type" : "type-1919",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15968,7 +15965,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-1787",
+   "self_type" : "type-2514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15977,7 +15974,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-322",
-   "self_type" : "type-1539",
+   "self_type" : "type-2268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15986,7 +15983,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-1436",
+   "self_type" : "type-2079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15995,7 +15992,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-1765",
+   "self_type" : "type-2492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16003,8 +16000,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16013,7 +16010,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-1780",
+   "self_type" : "type-2507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16031,7 +16028,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-1772",
+   "self_type" : "type-2499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16039,8 +16036,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3607",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16048,8 +16045,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16057,8 +16054,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4179",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4841",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16066,8 +16063,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5066",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5118",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16120,8 +16117,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16129,8 +16126,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-4939",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-7654",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16148,7 +16145,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-174",
-   "self_type" : "type-3649",
+   "self_type" : "type-4307",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16157,7 +16154,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-306",
-   "self_type" : "type-2937",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16175,7 +16172,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-2936",
+   "self_type" : "type-1476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16192,8 +16189,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2242",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16210,8 +16207,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1533",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1674",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16219,8 +16234,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16228,8 +16243,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3795",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16237,8 +16252,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2981",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16246,8 +16261,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3101",
-   "self_type" : "type-3103",
+   "referenced_type" : "type-4128",
+   "self_type" : "type-4130",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16255,8 +16270,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5414",
-   "self_type" : "type-5416",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5518",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16264,8 +16279,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5612",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5714",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16273,8 +16288,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5765",
-   "self_type" : "type-5768",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16282,26 +16297,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6015",
-   "self_type" : "type-6017",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6101",
-   "self_type" : "type-6103",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6326",
-   "self_type" : "type-6328",
+   "referenced_type" : "type-6122",
+   "self_type" : "type-6124",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16309,8 +16306,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6487",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16318,8 +16315,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6642",
-   "self_type" : "type-6644",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16327,6 +16324,24 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6634",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6714",
+   "self_type" : "type-6716",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
    "referenced_type" : "type-681",
    "self_type" : "type-683",
    "size" : 8,
@@ -16336,24 +16351,6 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6843",
-   "self_type" : "type-6845",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6911",
-   "self_type" : "type-6913",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
    "referenced_type" : "type-983",
    "self_type" : "type-987",
    "size" : 8,
@@ -16363,8 +16360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-2885",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16372,8 +16369,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-5927",
-   "self_type" : "type-5929",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16381,8 +16378,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6769",
-   "self_type" : "type-6771",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16390,8 +16387,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-3922",
-   "self_type" : "type-3924",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16399,8 +16396,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4093",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16408,8 +16405,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7325",
-   "self_type" : "type-7328",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16417,8 +16414,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7473",
-   "self_type" : "type-7475",
+   "referenced_type" : "type-7365",
+   "self_type" : "type-7367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16426,8 +16423,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2963",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1513",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16435,8 +16432,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3079",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1648",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16444,8 +16441,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3667",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4325",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16453,8 +16450,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1647",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16462,8 +16459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
-   "referenced_type" : "type-3654",
-   "self_type" : "type-3666",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4324",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16471,8 +16468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3668",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4326",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16534,8 +16531,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-3876",
-   "self_type" : "type-3875",
+   "referenced_type" : "type-4536",
+   "self_type" : "type-4535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16543,8 +16540,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7273",
-   "self_type" : "type-7272",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16570,8 +16567,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16579,8 +16576,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1624",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2687",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16588,8 +16603,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16597,8 +16612,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16606,8 +16621,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3060",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16615,8 +16630,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3637",
-   "self_type" : "type-3639",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16624,8 +16639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3917",
+   "referenced_type" : "type-4575",
+   "self_type" : "type-4577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16633,8 +16648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16642,8 +16657,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4354",
-   "self_type" : "type-4356",
+   "referenced_type" : "type-5022",
+   "self_type" : "type-5024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16651,8 +16666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4870",
-   "self_type" : "type-4872",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16660,17 +16675,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5014",
-   "self_type" : "type-5016",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-5439",
-   "self_type" : "type-5441",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16678,8 +16684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5763",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16687,8 +16693,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5988",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6048",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16696,26 +16702,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6065",
-   "self_type" : "type-6067",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6256",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-6346",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6144",
+   "self_type" : "type-6146",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16723,8 +16711,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6640",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16732,8 +16720,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6829",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16741,8 +16729,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6889",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16750,8 +16738,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7037",
-   "self_type" : "type-7039",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16759,8 +16747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7319",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16768,8 +16756,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7463",
-   "self_type" : "type-7465",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7358",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16777,8 +16765,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7596",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16793,10 +16781,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7686",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
    "referenced_type" : "type-1266",
-   "self_type" : "type-3105",
+   "self_type" : "type-1676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16813,8 +16810,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1937",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16831,8 +16828,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1387",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16867,8 +16864,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-3693",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4573",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16876,8 +16873,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-3925",
-   "self_type" : "type-3926",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16984,8 +16981,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16993,8 +16990,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17002,8 +16999,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17011,8 +17008,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17020,8 +17017,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4186",
-   "self_type" : "type-4185",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17029,8 +17026,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6205",
-   "self_type" : "type-6207",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5996",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17038,8 +17035,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17048,7 +17045,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-1311",
-   "self_type" : "type-1363",
+   "self_type" : "type-1487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17065,8 +17062,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17074,8 +17071,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-3572",
-   "self_type" : "type-3577",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17083,8 +17080,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3860",
+   "referenced_type" : "type-4519",
+   "self_type" : "type-4520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17101,8 +17098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17110,8 +17107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17120,7 +17117,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
    "referenced_type" : "type-1197",
-   "self_type" : "type-1663",
+   "self_type" : "type-1861",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17137,8 +17134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3609",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-4267",
+   "self_type" : "type-4393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17146,8 +17143,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3735",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17155,8 +17152,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4172",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17164,8 +17161,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5055",
-   "self_type" : "type-5060",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5115",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17173,8 +17170,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
    "name" : "const android::sp<android::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3646",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4304",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17209,8 +17206,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1761",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17245,8 +17242,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-2848",
-   "self_type" : "type-2847",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17254,8 +17251,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-4225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17263,8 +17260,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-3853",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-4513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17272,8 +17269,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-3584",
-   "self_type" : "type-3589",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17281,8 +17278,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3862",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17290,8 +17287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-4226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17299,8 +17296,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-3856",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-4516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17308,8 +17305,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-3578",
-   "self_type" : "type-3583",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17317,8 +17314,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17362,8 +17359,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
    "name" : "const android::wp<android::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4298",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17371,8 +17368,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-3625",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-4283",
+   "self_type" : "type-4284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17380,8 +17377,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17398,8 +17395,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17444,7 +17441,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-480",
-   "self_type" : "type-2962",
+   "self_type" : "type-1512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17472,78 +17469,43 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3542",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3651",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-3712",
+   "self_type" : "type-3714",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3716",
-   "self_type" : "type-3718",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3846",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3881",
-   "self_type" : "type-3883",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3908",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4188",
-   "self_type" : "type-4190",
+   "referenced_type" : "type-4375",
+   "self_type" : "type-4377",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17556,155 +17518,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4776",
-   "self_type" : "type-4778",
+   "referenced_type" : "type-4504",
+   "self_type" : "type-4506",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4820",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4902",
-   "self_type" : "type-4904",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4965",
-   "self_type" : "type-4967",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4722",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5075",
-   "self_type" : "type-5077",
+   "referenced_type" : "type-4850",
+   "self_type" : "type-4852",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5141",
-   "self_type" : "type-5143",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5280",
-   "self_type" : "type-5282",
+   "referenced_type" : "type-5176",
+   "self_type" : "type-5178",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5513",
-   "self_type" : "type-5515",
+   "referenced_type" : "type-5382",
+   "self_type" : "type-5384",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5622",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5615",
+   "self_type" : "type-5617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5687",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5726",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5807",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5787",
+   "self_type" : "type-5789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6275",
-   "self_type" : "type-6277",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5911",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6069",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6503",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6203",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6559",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6299",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6666",
-   "self_type" : "type-6668",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7118",
-   "self_type" : "type-7120",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6435",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6974",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7277",
-   "self_type" : "type-7279",
+   "referenced_type" : "type-7106",
+   "self_type" : "type-7109",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7305",
-   "self_type" : "type-7307",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7161",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7449",
-   "self_type" : "type-7451",
+   "referenced_type" : "type-7195",
+   "self_type" : "type-7197",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7571",
-   "self_type" : "type-7573",
+   "referenced_type" : "type-7345",
+   "self_type" : "type-7347",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7445",
+   "self_type" : "type-7447",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7484",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7536",
+   "self_type" : "type-7538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7616",
+   "self_type" : "type-7618",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17718,8 +17715,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2332",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17754,8 +17751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1928",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17763,8 +17760,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-4326",
-   "self_type" : "type-4328",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,8 +17769,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-6246",
-   "self_type" : "type-6248",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17781,8 +17778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-7412",
-   "self_type" : "type-7416",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17790,8 +17787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1921",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17799,8 +17796,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-4322",
-   "self_type" : "type-4324",
+   "referenced_type" : "type-4986",
+   "self_type" : "type-4988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17808,8 +17805,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-6243",
-   "self_type" : "type-6245",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17817,8 +17814,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-7397",
-   "self_type" : "type-7405",
+   "referenced_type" : "type-7512",
+   "self_type" : "type-7518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17826,8 +17823,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3077",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1646",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17835,8 +17832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6079",
-   "self_type" : "type-6081",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4108",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17844,8 +17841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6897",
-   "self_type" : "type-6899",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17880,8 +17877,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17889,8 +17886,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3536",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17898,8 +17895,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2547",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17907,8 +17904,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2610",
-   "self_type" : "type-2609",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17916,44 +17913,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3829",
-   "self_type" : "type-3828",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3897",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3962",
-   "self_type" : "type-3961",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3831",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17970,8 +17931,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4002",
-   "self_type" : "type-4001",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17979,8 +17940,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4208",
-   "self_type" : "type-4207",
+   "referenced_type" : "type-4489",
+   "self_type" : "type-4488",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17988,8 +17949,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17997,8 +17958,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4797",
-   "self_type" : "type-4796",
+   "referenced_type" : "type-4622",
+   "self_type" : "type-4621",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18006,8 +17967,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4921",
-   "self_type" : "type-4920",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4661",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18015,8 +17976,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18024,8 +17985,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5104",
-   "self_type" : "type-5103",
+   "referenced_type" : "type-5142",
+   "self_type" : "type-5141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18033,8 +17994,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18042,8 +18003,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5245",
-   "self_type" : "type-5244",
+   "referenced_type" : "type-5347",
+   "self_type" : "type-5346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18051,8 +18012,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5510",
-   "self_type" : "type-5509",
+   "referenced_type" : "type-5612",
+   "self_type" : "type-5611",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18060,8 +18021,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5620",
-   "self_type" : "type-5619",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18069,8 +18030,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5683",
-   "self_type" : "type-5682",
+   "referenced_type" : "type-5785",
+   "self_type" : "type-5784",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18078,8 +18039,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-5805",
-   "self_type" : "type-5804",
+   "referenced_type" : "type-5907",
+   "self_type" : "type-5906",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18087,8 +18048,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-6270",
-   "self_type" : "type-6269",
+   "referenced_type" : "type-6062",
+   "self_type" : "type-6061",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18096,8 +18057,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-6403",
-   "self_type" : "type-6402",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6198",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18105,8 +18066,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-6501",
-   "self_type" : "type-6500",
+   "referenced_type" : "type-6295",
+   "self_type" : "type-6294",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18114,8 +18075,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-6555",
-   "self_type" : "type-6554",
+   "referenced_type" : "type-6339",
+   "self_type" : "type-6338",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18123,8 +18084,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18132,8 +18093,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7098",
-   "self_type" : "type-7097",
+   "referenced_type" : "type-6952",
+   "self_type" : "type-6951",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18141,8 +18102,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7229",
-   "self_type" : "type-7228",
+   "referenced_type" : "type-7091",
+   "self_type" : "type-7090",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18150,8 +18111,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7290",
-   "self_type" : "type-7289",
+   "referenced_type" : "type-7179",
+   "self_type" : "type-7178",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18159,8 +18120,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7367",
-   "self_type" : "type-7366",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18168,8 +18129,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7409",
-   "self_type" : "type-7408",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18177,8 +18138,44 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-7598",
-   "self_type" : "type-7597",
+   "referenced_type" : "type-7473",
+   "self_type" : "type-7472",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7499",
+   "self_type" : "type-7498",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7504",
+   "self_type" : "type-7503",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7632",
+   "self_type" : "type-7631",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7644",
+   "self_type" : "type-7643",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18195,8 +18192,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3722",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18204,8 +18201,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-3847",
-   "self_type" : "type-3849",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18213,8 +18210,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7122",
-   "self_type" : "type-7124",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18222,8 +18219,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7245",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18258,8 +18255,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18285,8 +18282,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18295,7 +18292,7 @@
    "linker_set_key" : "long &",
    "name" : "long &",
    "referenced_type" : "type-32",
-   "self_type" : "type-2890",
+   "self_type" : "type-1430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18303,8 +18300,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4101",
-   "self_type" : "type-4100",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18312,8 +18309,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4203",
-   "self_type" : "type-4202",
+   "referenced_type" : "type-4865",
+   "self_type" : "type-4864",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18321,8 +18318,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4882",
-   "self_type" : "type-4881",
+   "referenced_type" : "type-5084",
+   "self_type" : "type-5083",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18330,8 +18327,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5018",
-   "self_type" : "type-5017",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18339,8 +18336,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5097",
-   "self_type" : "type-5096",
+   "referenced_type" : "type-7373",
+   "self_type" : "type-7372",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18348,8 +18345,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7483",
-   "self_type" : "type-7482",
+   "referenced_type" : "type-7467",
+   "self_type" : "type-7466",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18357,8 +18354,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7593",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18375,8 +18372,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18384,8 +18381,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-5034",
-   "self_type" : "type-5033",
+   "referenced_type" : "type-5259",
+   "self_type" : "type-5258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18393,8 +18390,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-6261",
-   "self_type" : "type-6260",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18402,8 +18399,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-3081",
-   "self_type" : "type-3288",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1884",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18411,8 +18408,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6085",
-   "self_type" : "type-6112",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4139",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18420,8 +18417,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6901",
-   "self_type" : "type-6917",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6730",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18430,7 +18427,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-92",
-   "self_type" : "type-2889",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18456,8 +18453,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *&",
    "name" : "unsigned long *&",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1873",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18466,7 +18463,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-500",
-   "self_type" : "type-2888",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18474,8 +18471,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2908",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18483,8 +18480,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-5951",
-   "self_type" : "type-5950",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18492,8 +18489,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6789",
-   "self_type" : "type-6788",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18513,8 +18510,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18522,8 +18519,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4174",
-   "self_type" : "type-4173",
+   "referenced_type" : "type-4836",
+   "self_type" : "type-4835",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18531,8 +18528,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6202",
-   "self_type" : "type-6201",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18540,8 +18537,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6651",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18576,8 +18573,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18585,8 +18582,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18594,8 +18591,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18603,8 +18600,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18612,8 +18609,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18621,8 +18618,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18630,8 +18627,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18639,8 +18636,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2868",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18648,8 +18645,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2883",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18657,8 +18654,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2904",
-   "self_type" : "type-2903",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3656",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18666,8 +18663,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18675,8 +18672,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3068",
-   "self_type" : "type-3067",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18684,8 +18681,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18693,8 +18690,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3815",
-   "self_type" : "type-3814",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18702,8 +18699,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3951",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18711,8 +18708,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3894",
-   "self_type" : "type-3893",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18720,8 +18717,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-4021",
+   "self_type" : "type-4020",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18729,8 +18726,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4088",
-   "self_type" : "type-4087",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18738,8 +18735,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4196",
-   "self_type" : "type-4195",
+   "referenced_type" : "type-4302",
+   "self_type" : "type-4301",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18747,8 +18744,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18756,8 +18753,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4788",
-   "self_type" : "type-4787",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18765,8 +18762,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4879",
-   "self_type" : "type-4878",
+   "referenced_type" : "type-4554",
+   "self_type" : "type-4553",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18774,8 +18771,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18783,8 +18780,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5026",
-   "self_type" : "type-5025",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18792,8 +18789,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18801,8 +18798,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5204",
-   "self_type" : "type-5203",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18810,8 +18807,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5452",
-   "self_type" : "type-5451",
+   "referenced_type" : "type-5090",
+   "self_type" : "type-5089",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18819,8 +18816,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5131",
+   "self_type" : "type-5130",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18828,8 +18825,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5630",
-   "self_type" : "type-5629",
+   "referenced_type" : "type-5237",
+   "self_type" : "type-5236",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18837,8 +18834,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5720",
-   "self_type" : "type-5719",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18846,8 +18843,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18855,8 +18852,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5879",
-   "self_type" : "type-5878",
+   "referenced_type" : "type-5732",
+   "self_type" : "type-5731",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18864,8 +18861,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5910",
-   "self_type" : "type-5909",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18873,8 +18870,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5925",
-   "self_type" : "type-5924",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5845",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18882,8 +18879,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5946",
-   "self_type" : "type-5945",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18891,8 +18888,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18900,8 +18897,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18909,8 +18906,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6241",
-   "self_type" : "type-6240",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18918,8 +18915,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6355",
-   "self_type" : "type-6354",
+   "referenced_type" : "type-6377",
+   "self_type" : "type-6376",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18927,8 +18924,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18936,8 +18933,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6511",
-   "self_type" : "type-6510",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18945,8 +18942,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6595",
-   "self_type" : "type-6594",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18954,8 +18951,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6621",
-   "self_type" : "type-6620",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18963,8 +18960,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6734",
-   "self_type" : "type-6733",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18972,8 +18969,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6750",
-   "self_type" : "type-6749",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18981,8 +18978,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6768",
-   "self_type" : "type-6767",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18990,8 +18987,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6783",
-   "self_type" : "type-6782",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18999,8 +18996,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6834",
-   "self_type" : "type-6833",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19008,8 +19005,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6895",
-   "self_type" : "type-6894",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19017,8 +19014,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7173",
+   "self_type" : "type-7172",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19026,8 +19023,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7218",
-   "self_type" : "type-7217",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19035,8 +19032,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7265",
-   "self_type" : "type-7264",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19044,8 +19041,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7286",
-   "self_type" : "type-7285",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19053,8 +19050,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7458",
+   "self_type" : "type-7457",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19062,8 +19059,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7495",
+   "self_type" : "type-7494",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19071,8 +19068,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7471",
-   "self_type" : "type-7470",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19080,8 +19077,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7583",
-   "self_type" : "type-7582",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19107,8 +19104,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1596",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19116,8 +19113,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-2378",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19125,8 +19122,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19134,8 +19131,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19143,8 +19140,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19152,8 +19149,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int)",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19161,8 +19158,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int, unsigned char *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int, unsigned char *)",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19170,8 +19167,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19179,8 +19176,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19188,8 +19185,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19197,8 +19194,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19206,8 +19203,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19215,8 +19212,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19224,8 +19221,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_VERSIONTYPE *, OMX_VERSIONTYPE *, unsigned char (*)[128])",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_VERSIONTYPE *, OMX_VERSIONTYPE *, unsigned char (*)[128])",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19233,8 +19230,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19242,8 +19239,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19251,8 +19248,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, void *, unsigned int, OMX_TUNNELSETUPTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, void *, unsigned int, OMX_TUNNELSETUPTYPE *)",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19260,8 +19257,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19269,8 +19266,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_EVENTTYPE, unsigned int, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_EVENTTYPE, unsigned int, unsigned int, void *)",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19278,8 +19275,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-2369",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19287,8 +19284,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-2372",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19296,8 +19293,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-2375",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19305,8 +19302,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-2361",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19341,8 +19338,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19350,8 +19347,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19359,8 +19356,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19368,8 +19365,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19377,8 +19374,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2620",
-   "self_type" : "type-2619",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19386,8 +19383,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19395,8 +19392,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
+   "referenced_type" : "type-2611",
+   "self_type" : "type-2610",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19404,8 +19401,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19413,8 +19410,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19422,8 +19419,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2900",
-   "self_type" : "type-2899",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19431,8 +19428,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19440,8 +19437,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3066",
-   "self_type" : "type-3065",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19449,8 +19446,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3642",
-   "self_type" : "type-3641",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3930",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19458,8 +19455,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3855",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19467,8 +19464,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3866",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19476,8 +19473,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3892",
-   "self_type" : "type-3891",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19485,8 +19482,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3919",
-   "self_type" : "type-3918",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19494,8 +19491,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4086",
-   "self_type" : "type-4085",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19503,8 +19500,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4194",
-   "self_type" : "type-4193",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19512,8 +19509,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19521,8 +19518,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4786",
-   "self_type" : "type-4785",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19530,8 +19527,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4877",
-   "self_type" : "type-4876",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19539,8 +19536,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4913",
-   "self_type" : "type-4912",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19548,8 +19545,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5024",
-   "self_type" : "type-5023",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4745",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19557,8 +19554,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5085",
-   "self_type" : "type-5084",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4855",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19566,8 +19563,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5197",
-   "self_type" : "type-5196",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19575,8 +19572,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5450",
-   "self_type" : "type-5449",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19584,8 +19581,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5129",
+   "self_type" : "type-5128",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19593,8 +19590,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5628",
-   "self_type" : "type-5627",
+   "referenced_type" : "type-5230",
+   "self_type" : "type-5229",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19602,8 +19599,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5693",
-   "self_type" : "type-5692",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19611,8 +19608,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5861",
-   "self_type" : "type-5860",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19620,8 +19617,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5904",
-   "self_type" : "type-5903",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19629,8 +19626,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5920",
-   "self_type" : "type-5919",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19638,8 +19635,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5940",
-   "self_type" : "type-5939",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19647,8 +19644,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5942",
-   "self_type" : "type-5941",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19656,8 +19653,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5992",
-   "self_type" : "type-5991",
+   "referenced_type" : "type-6151",
+   "self_type" : "type-6150",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19665,8 +19662,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6070",
-   "self_type" : "type-6069",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19674,8 +19671,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6239",
-   "self_type" : "type-6238",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19683,8 +19680,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6353",
-   "self_type" : "type-6352",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19692,8 +19689,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19701,8 +19698,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6509",
-   "self_type" : "type-6508",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19710,8 +19707,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6567",
-   "self_type" : "type-6566",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19719,8 +19716,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6717",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19728,8 +19725,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6745",
-   "self_type" : "type-6744",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19737,8 +19734,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6762",
-   "self_type" : "type-6761",
+   "referenced_type" : "type-6607",
+   "self_type" : "type-6606",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19746,8 +19743,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6777",
-   "self_type" : "type-6776",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19755,8 +19752,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6780",
-   "self_type" : "type-6779",
+   "referenced_type" : "type-6904",
+   "self_type" : "type-6903",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19764,8 +19761,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6832",
-   "self_type" : "type-6831",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19773,8 +19770,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6892",
-   "self_type" : "type-6891",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19782,8 +19779,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19791,8 +19788,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7252",
-   "self_type" : "type-7251",
+   "referenced_type" : "type-7214",
+   "self_type" : "type-7213",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19800,8 +19797,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7263",
-   "self_type" : "type-7262",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19809,8 +19806,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7284",
-   "self_type" : "type-7283",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19818,8 +19815,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7295",
-   "self_type" : "type-7294",
+   "referenced_type" : "type-7456",
+   "self_type" : "type-7455",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19827,8 +19824,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7322",
-   "self_type" : "type-7321",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19836,8 +19833,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7468",
-   "self_type" : "type-7467",
+   "referenced_type" : "type-7590",
+   "self_type" : "type-7589",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19845,8 +19842,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7581",
-   "self_type" : "type-7580",
+   "referenced_type" : "type-7624",
+   "self_type" : "type-7623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19899,15 +19896,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 8,
@@ -19917,8 +19905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19926,8 +19914,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-6196",
-   "self_type" : "type-6195",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5840",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5984",
+   "self_type" : "type-5983",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19999,7 +19996,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-82",
-   "self_type" : "type-3843",
+   "self_type" : "type-4503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20016,8 +20013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20025,8 +20022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6033",
-   "self_type" : "type-6032",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20034,8 +20031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6854",
-   "self_type" : "type-6853",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20043,8 +20040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20052,8 +20049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6051",
-   "self_type" : "type-6050",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20061,8 +20058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6869",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20070,8 +20067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20079,8 +20076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6977",
-   "self_type" : "type-6976",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20088,8 +20085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2952",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20097,8 +20094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1628",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20106,8 +20103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20115,8 +20112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3825",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4485",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20124,8 +20121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20133,8 +20130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7207",
-   "self_type" : "type-7206",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20160,8 +20157,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1529",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20169,8 +20184,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20178,8 +20193,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2978",
-   "self_type" : "type-2977",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20187,8 +20202,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20196,8 +20211,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5611",
-   "self_type" : "type-5610",
+   "referenced_type" : "type-5713",
+   "self_type" : "type-5712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20205,8 +20220,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5655",
-   "self_type" : "type-5654",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20214,26 +20229,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6014",
-   "self_type" : "type-6013",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BufferItem *",
-   "name" : "android::BufferItem *",
-   "referenced_type" : "type-6100",
-   "self_type" : "type-6099",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BufferItem *",
-   "name" : "android::BufferItem *",
-   "referenced_type" : "type-6490",
-   "self_type" : "type-6489",
+   "referenced_type" : "type-6284",
+   "self_type" : "type-6283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20241,8 +20238,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6531",
-   "self_type" : "type-6530",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20250,8 +20247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6842",
-   "self_type" : "type-6841",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20259,8 +20256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6909",
-   "self_type" : "type-6908",
+   "referenced_type" : "type-6713",
+   "self_type" : "type-6712",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20277,8 +20274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20286,8 +20283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20295,8 +20292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6233",
-   "self_type" : "type-6232",
+   "referenced_type" : "type-6022",
+   "self_type" : "type-6021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20304,8 +20301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7117",
-   "self_type" : "type-7116",
+   "referenced_type" : "type-7235",
+   "self_type" : "type-7234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20313,8 +20310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20322,8 +20319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20331,8 +20328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20358,8 +20355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20367,8 +20364,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2517",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20376,8 +20373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2674",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20385,8 +20382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5492",
-   "self_type" : "type-5491",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20394,8 +20391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5590",
-   "self_type" : "type-5589",
+   "referenced_type" : "type-5692",
+   "self_type" : "type-5691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20403,8 +20400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5747",
-   "self_type" : "type-5746",
+   "referenced_type" : "type-5849",
+   "self_type" : "type-5848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20412,8 +20409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6385",
-   "self_type" : "type-6384",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20421,8 +20418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6477",
-   "self_type" : "type-6476",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20430,8 +20427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6625",
-   "self_type" : "type-6624",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20457,8 +20454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20466,8 +20463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20475,8 +20472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6374",
-   "self_type" : "type-6373",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20511,8 +20508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20520,8 +20517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5675",
-   "self_type" : "type-5674",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20529,8 +20526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6547",
-   "self_type" : "type-6546",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20556,8 +20553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20565,8 +20562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-2920",
-   "self_type" : "type-2919",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20574,8 +20571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5786",
-   "self_type" : "type-5785",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20583,8 +20580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5961",
-   "self_type" : "type-5960",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20592,8 +20589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20601,8 +20598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6802",
-   "self_type" : "type-6801",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20610,8 +20607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20619,8 +20616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20637,8 +20634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5265",
-   "self_type" : "type-5264",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20646,8 +20643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5454",
-   "self_type" : "type-5453",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20655,8 +20652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6274",
-   "self_type" : "type-6273",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20664,8 +20661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20709,8 +20706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20718,8 +20715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20727,8 +20724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20736,8 +20733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2559",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20745,8 +20742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20754,8 +20751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20763,8 +20760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2874",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20772,8 +20769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20781,8 +20778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2922",
-   "self_type" : "type-2921",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20790,8 +20787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3032",
-   "self_type" : "type-3031",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20799,8 +20796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3051",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20808,8 +20805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20817,8 +20814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3996",
-   "self_type" : "type-3995",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20826,8 +20823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20835,8 +20832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4273",
-   "self_type" : "type-4272",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20844,8 +20841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4804",
-   "self_type" : "type-4803",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20853,8 +20850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4946",
-   "self_type" : "type-4945",
+   "referenced_type" : "type-4398",
+   "self_type" : "type-4397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20862,8 +20859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5108",
-   "self_type" : "type-5107",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20871,8 +20868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5420",
-   "self_type" : "type-5419",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20880,8 +20877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5459",
-   "self_type" : "type-5458",
+   "referenced_type" : "type-4935",
+   "self_type" : "type-4934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20889,8 +20886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5633",
-   "self_type" : "type-5632",
+   "referenced_type" : "type-5146",
+   "self_type" : "type-5145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20898,8 +20895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5635",
-   "self_type" : "type-5634",
+   "referenced_type" : "type-5522",
+   "self_type" : "type-5521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20907,8 +20904,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5811",
-   "self_type" : "type-5810",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20916,8 +20913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5735",
+   "self_type" : "type-5734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20925,8 +20922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5938",
-   "self_type" : "type-5937",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20934,8 +20931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20943,8 +20940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20952,8 +20949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6058",
-   "self_type" : "type-6057",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20961,8 +20958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6224",
-   "self_type" : "type-6223",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20970,8 +20967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6330",
-   "self_type" : "type-6329",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20979,8 +20976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20988,8 +20985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6513",
-   "self_type" : "type-6512",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20997,8 +20994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6536",
+   "self_type" : "type-6535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21006,8 +21003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6673",
-   "self_type" : "type-6672",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21015,8 +21012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6757",
-   "self_type" : "type-6756",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21024,8 +21021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6775",
-   "self_type" : "type-6774",
+   "referenced_type" : "type-6653",
+   "self_type" : "type-6652",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21033,8 +21030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6804",
-   "self_type" : "type-6803",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21042,8 +21039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21051,26 +21048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6877",
-   "self_type" : "type-6876",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7034",
-   "self_type" : "type-7033",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7145",
-   "self_type" : "type-7144",
+   "referenced_type" : "type-7188",
+   "self_type" : "type-7187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21087,8 +21066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7404",
-   "self_type" : "type-7403",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21096,8 +21075,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7418",
-   "self_type" : "type-7417",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7515",
+   "self_type" : "type-7514",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21124,7 +21121,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-22",
-   "self_type" : "type-2960",
+   "self_type" : "type-1511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21133,7 +21130,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-17",
-   "self_type" : "type-3071",
+   "self_type" : "type-1637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21142,7 +21139,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-26",
-   "self_type" : "type-3653",
+   "self_type" : "type-4311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21151,7 +21148,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-15",
-   "self_type" : "type-3074",
+   "self_type" : "type-1641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21160,7 +21157,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-33",
-   "self_type" : "type-3656",
+   "self_type" : "type-4314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21169,7 +21166,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-35",
-   "self_type" : "type-3659",
+   "self_type" : "type-4317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21195,8 +21192,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21204,8 +21201,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-2931",
-   "self_type" : "type-2930",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21213,8 +21210,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5752",
-   "self_type" : "type-5751",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-3998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21222,8 +21219,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5972",
-   "self_type" : "type-5971",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21231,8 +21228,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21240,8 +21237,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6815",
-   "self_type" : "type-6814",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21267,8 +21264,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21276,8 +21273,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21285,8 +21282,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2498",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21294,8 +21291,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21303,8 +21300,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21312,8 +21309,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21321,8 +21318,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2924",
-   "self_type" : "type-2923",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21330,8 +21327,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3033",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21339,8 +21336,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21348,8 +21345,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21357,8 +21354,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3890",
-   "self_type" : "type-3889",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21366,8 +21363,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4068",
+   "self_type" : "type-4067",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21375,8 +21372,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21384,8 +21381,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4949",
-   "self_type" : "type-4948",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21393,8 +21390,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5109",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21402,8 +21399,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5425",
-   "self_type" : "type-5424",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21411,8 +21408,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5461",
-   "self_type" : "type-5460",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21420,8 +21417,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21429,8 +21426,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5637",
-   "self_type" : "type-5636",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21438,8 +21435,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5857",
-   "self_type" : "type-5856",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21447,8 +21444,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5918",
-   "self_type" : "type-5917",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21456,8 +21453,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21465,8 +21462,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6041",
-   "self_type" : "type-6040",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21474,8 +21471,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6056",
-   "self_type" : "type-6055",
+   "referenced_type" : "type-6131",
+   "self_type" : "type-6130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21483,8 +21480,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6198",
-   "self_type" : "type-6197",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21492,8 +21489,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6335",
-   "self_type" : "type-6334",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21501,8 +21498,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21510,8 +21507,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6406",
-   "self_type" : "type-6405",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21519,8 +21516,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6465",
-   "self_type" : "type-6464",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21528,8 +21525,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6518",
-   "self_type" : "type-6517",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21537,8 +21534,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6713",
-   "self_type" : "type-6712",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21546,8 +21543,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6760",
-   "self_type" : "type-6759",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21555,8 +21552,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6806",
-   "self_type" : "type-6805",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21564,26 +21561,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6861",
-   "self_type" : "type-6860",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6875",
-   "self_type" : "type-6874",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7202",
-   "self_type" : "type-7201",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21600,6 +21579,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7320",
+   "self_type" : "type-7319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
    "referenced_type" : "type-735",
    "self_type" : "type-734",
    "size" : 8,
@@ -21609,8 +21597,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7425",
-   "self_type" : "type-7424",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7664",
+   "self_type" : "type-7663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21654,8 +21651,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21663,8 +21660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21672,8 +21669,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21681,44 +21678,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2543",
-   "self_type" : "type-2542",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2599",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2724",
-   "self_type" : "type-2723",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21735,8 +21696,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21744,8 +21705,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3732",
-   "self_type" : "type-3731",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21753,8 +21714,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3944",
-   "self_type" : "type-3943",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21762,8 +21723,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4108",
-   "self_type" : "type-4107",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21771,8 +21732,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4892",
-   "self_type" : "type-4891",
+   "referenced_type" : "type-3824",
+   "self_type" : "type-3823",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21780,8 +21741,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5038",
-   "self_type" : "type-5037",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21789,8 +21750,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21798,8 +21759,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5226",
-   "self_type" : "type-5225",
+   "referenced_type" : "type-4212",
+   "self_type" : "type-4211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21807,8 +21768,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21816,8 +21777,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5505",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21825,8 +21786,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5616",
-   "self_type" : "type-5615",
+   "referenced_type" : "type-4770",
+   "self_type" : "type-4769",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21834,8 +21795,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5673",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5097",
+   "self_type" : "type-5096",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21843,8 +21804,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5797",
-   "self_type" : "type-5796",
+   "referenced_type" : "type-5165",
+   "self_type" : "type-5164",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21852,8 +21813,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5914",
-   "self_type" : "type-5913",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21861,8 +21822,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5955",
-   "self_type" : "type-5954",
+   "referenced_type" : "type-5540",
+   "self_type" : "type-5539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21870,8 +21831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6185",
-   "self_type" : "type-6184",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21879,8 +21840,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6268",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21888,8 +21849,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6345",
-   "self_type" : "type-6344",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21897,8 +21858,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6394",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21906,8 +21867,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6496",
-   "self_type" : "type-6495",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21915,8 +21876,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6545",
-   "self_type" : "type-6544",
+   "referenced_type" : "type-6143",
+   "self_type" : "type-6142",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21924,8 +21885,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6661",
-   "self_type" : "type-6660",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21933,8 +21894,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6755",
-   "self_type" : "type-6754",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21942,8 +21903,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6794",
-   "self_type" : "type-6793",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21951,8 +21912,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6957",
-   "self_type" : "type-6956",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21960,8 +21921,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7136",
-   "self_type" : "type-7135",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21969,8 +21930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7349",
-   "self_type" : "type-7348",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21978,8 +21939,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7491",
-   "self_type" : "type-7490",
+   "referenced_type" : "type-6818",
+   "self_type" : "type-6817",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7242",
+   "self_type" : "type-7241",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21996,6 +21984,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7604",
+   "self_type" : "type-7603",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "type-843",
    "self_type" : "type-842",
    "size" : 8,
@@ -22032,8 +22029,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22050,8 +22047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5877",
-   "self_type" : "type-5876",
+   "referenced_type" : "type-5979",
+   "self_type" : "type-5978",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22059,8 +22056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22077,8 +22074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-3602",
-   "self_type" : "type-3601",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22086,8 +22083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-4269",
+   "self_type" : "type-4268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22095,8 +22092,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4037",
-   "self_type" : "type-4036",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22104,8 +22101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4952",
-   "self_type" : "type-4951",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22113,8 +22110,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22122,8 +22119,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22131,8 +22128,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7438",
-   "self_type" : "type-7437",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22140,8 +22137,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4170",
-   "self_type" : "type-4169",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22149,8 +22146,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5058",
-   "self_type" : "type-5057",
+   "referenced_type" : "type-5113",
+   "self_type" : "type-5112",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22158,8 +22155,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7552",
-   "self_type" : "type-7551",
+   "referenced_type" : "type-7436",
+   "self_type" : "type-7435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22167,8 +22164,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22176,8 +22173,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4007",
-   "self_type" : "type-4006",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22185,8 +22182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7024",
-   "self_type" : "type-7023",
+   "referenced_type" : "type-6890",
+   "self_type" : "type-6889",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22194,8 +22191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7415",
-   "self_type" : "type-7414",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22203,8 +22200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-4166",
-   "self_type" : "type-4165",
+   "referenced_type" : "type-4828",
+   "self_type" : "type-4827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22212,8 +22209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-7548",
-   "self_type" : "type-7547",
+   "referenced_type" : "type-7432",
+   "self_type" : "type-7431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22221,8 +22218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-3630",
-   "self_type" : "type-3629",
+   "referenced_type" : "type-4288",
+   "self_type" : "type-4287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22230,8 +22227,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4936",
-   "self_type" : "type-4935",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22239,8 +22236,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7027",
-   "self_type" : "type-7026",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22248,8 +22245,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-5053",
-   "self_type" : "type-5052",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22257,8 +22254,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22266,8 +22263,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22275,8 +22272,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22284,8 +22281,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7261",
-   "self_type" : "type-7260",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22329,8 +22326,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22338,8 +22335,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2507",
-   "self_type" : "type-2506",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22347,8 +22344,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22356,8 +22353,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22365,8 +22362,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3022",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22374,8 +22371,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3052",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22383,8 +22380,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4284",
-   "self_type" : "type-4283",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22392,8 +22389,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5112",
-   "self_type" : "type-5111",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22401,8 +22398,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22410,8 +22407,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5580",
-   "self_type" : "type-5579",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22419,8 +22416,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22428,8 +22425,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5732",
-   "self_type" : "type-5731",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22437,8 +22434,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22446,8 +22443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6060",
-   "self_type" : "type-6059",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22455,8 +22452,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6231",
-   "self_type" : "type-6230",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22464,8 +22461,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6370",
-   "self_type" : "type-6369",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22473,8 +22470,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6472",
-   "self_type" : "type-6471",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22482,8 +22479,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22491,8 +22488,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6608",
-   "self_type" : "type-6607",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22500,8 +22497,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6851",
-   "self_type" : "type-6850",
+   "referenced_type" : "type-6645",
+   "self_type" : "type-6644",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22509,8 +22506,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6880",
-   "self_type" : "type-6879",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22518,8 +22515,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7096",
-   "self_type" : "type-7095",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22563,8 +22560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22572,8 +22569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22581,8 +22578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2901",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22590,8 +22587,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2929",
-   "self_type" : "type-2928",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22599,8 +22596,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3041",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22608,8 +22605,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22617,8 +22614,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5750",
-   "self_type" : "type-5749",
+   "referenced_type" : "type-4075",
+   "self_type" : "type-4074",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22635,8 +22641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5944",
-   "self_type" : "type-5943",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22644,8 +22650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5970",
-   "self_type" : "type-5969",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22653,8 +22659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6048",
-   "self_type" : "type-6047",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22662,8 +22668,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6219",
-   "self_type" : "type-6218",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22671,8 +22677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6403",
+   "self_type" : "type-6402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22680,8 +22686,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6627",
-   "self_type" : "type-6626",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22689,17 +22695,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6812",
-   "self_type" : "type-6811",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6867",
-   "self_type" : "type-6866",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22716,8 +22713,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22725,8 +22722,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22734,8 +22731,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3569",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22743,17 +22740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4808",
-   "self_type" : "type-4807",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5577",
+   "self_type" : "type-5576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22770,8 +22758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5936",
-   "self_type" : "type-5935",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22779,8 +22767,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22788,8 +22776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6372",
-   "self_type" : "type-6371",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22797,8 +22785,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6972",
-   "self_type" : "type-6971",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22833,8 +22830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2718",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22842,8 +22839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-3819",
+   "self_type" : "type-3818",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22851,8 +22848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-3916",
+   "self_type" : "type-3915",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22860,8 +22857,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5889",
-   "self_type" : "type-5888",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22869,8 +22866,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22878,8 +22875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6741",
-   "self_type" : "type-6740",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22905,8 +22902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22914,8 +22911,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22923,8 +22920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22932,8 +22929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22941,8 +22938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22950,8 +22947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22959,8 +22956,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3901",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22968,8 +22965,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4031",
-   "self_type" : "type-4030",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22977,8 +22974,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4289",
-   "self_type" : "type-4288",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22986,8 +22983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4795",
-   "self_type" : "type-4794",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22995,8 +22992,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23004,8 +23001,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4926",
-   "self_type" : "type-4925",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23013,8 +23010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4944",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23022,8 +23019,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5114",
-   "self_type" : "type-5113",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23031,8 +23028,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5483",
-   "self_type" : "type-5482",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23040,8 +23037,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23049,8 +23046,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-6272",
+   "self_type" : "type-6271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23058,8 +23055,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5737",
-   "self_type" : "type-5736",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23067,8 +23064,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6235",
-   "self_type" : "type-6234",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23076,8 +23073,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6379",
-   "self_type" : "type-6378",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23085,8 +23082,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6479",
-   "self_type" : "type-6478",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23094,8 +23091,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23103,8 +23100,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6614",
-   "self_type" : "type-6613",
+   "referenced_type" : "type-7244",
+   "self_type" : "type-7243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23112,8 +23109,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6995",
-   "self_type" : "type-6994",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23121,8 +23118,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23130,8 +23127,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7255",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23139,8 +23136,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7293",
-   "self_type" : "type-7292",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23148,8 +23145,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7433",
-   "self_type" : "type-7432",
+   "referenced_type" : "type-7659",
+   "self_type" : "type-7658",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23193,8 +23190,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23202,8 +23199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23211,8 +23208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6529",
-   "self_type" : "type-6528",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23229,8 +23226,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-2574",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23238,8 +23235,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5647",
-   "self_type" : "type-5646",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23247,8 +23244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6527",
-   "self_type" : "type-6526",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23283,8 +23280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23292,8 +23289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23301,8 +23298,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6237",
-   "self_type" : "type-6236",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23310,8 +23307,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23320,7 +23317,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-48",
-   "self_type" : "type-3932",
+   "self_type" : "type-4592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23364,8 +23361,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23373,8 +23370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23382,8 +23379,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6263",
-   "self_type" : "type-6262",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23499,8 +23496,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23517,8 +23514,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2970",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23526,8 +23523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3092",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23535,8 +23532,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3675",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4333",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23544,8 +23541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23553,8 +23550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3680",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4338",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23562,8 +23559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3685",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23670,8 +23667,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23679,8 +23676,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23688,8 +23685,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23697,8 +23694,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23706,8 +23703,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-1482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23715,8 +23712,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23724,8 +23721,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23733,8 +23730,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23742,8 +23739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23751,8 +23748,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23760,8 +23757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23769,8 +23766,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2940",
-   "self_type" : "type-2939",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23778,8 +23775,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3054",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3843",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23787,8 +23784,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3632",
-   "self_type" : "type-3631",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23796,8 +23793,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3817",
-   "self_type" : "type-3816",
+   "referenced_type" : "type-3934",
+   "self_type" : "type-3933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23805,8 +23802,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23814,8 +23811,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23823,8 +23820,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-4008",
+   "self_type" : "type-4007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23832,8 +23829,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23841,8 +23838,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4183",
-   "self_type" : "type-4182",
+   "referenced_type" : "type-4290",
+   "self_type" : "type-4289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23850,8 +23847,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4330",
-   "self_type" : "type-4329",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23859,8 +23856,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4818",
-   "self_type" : "type-4817",
+   "referenced_type" : "type-4530",
+   "self_type" : "type-4529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23868,8 +23865,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4900",
-   "self_type" : "type-4899",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23877,8 +23874,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4963",
-   "self_type" : "type-4962",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23886,8 +23883,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-4715",
+   "self_type" : "type-4714",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23895,8 +23892,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5119",
-   "self_type" : "type-5118",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23904,8 +23901,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5432",
-   "self_type" : "type-5431",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23913,8 +23910,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5500",
-   "self_type" : "type-5499",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5120",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5159",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5534",
+   "self_type" : "type-5533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23931,15 +23946,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5664",
-   "self_type" : "type-5663",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 8,
@@ -23949,8 +23955,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5756",
-   "self_type" : "type-5755",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23958,8 +23964,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5817",
-   "self_type" : "type-5816",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23967,8 +23973,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5881",
-   "self_type" : "type-5880",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23976,26 +23982,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5907",
-   "self_type" : "type-5906",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5922",
-   "self_type" : "type-5921",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5948",
-   "self_type" : "type-5947",
+   "referenced_type" : "type-5919",
+   "self_type" : "type-5918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24012,8 +24000,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6062",
-   "self_type" : "type-6061",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24021,8 +24009,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6193",
-   "self_type" : "type-6192",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24030,8 +24018,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24039,8 +24027,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6340",
-   "self_type" : "type-6339",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24048,8 +24036,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6390",
-   "self_type" : "type-6389",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24057,8 +24045,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6407",
+   "self_type" : "type-6406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24066,8 +24054,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24075,8 +24063,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6634",
-   "self_type" : "type-6633",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24084,8 +24072,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6736",
-   "self_type" : "type-6735",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24093,8 +24081,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6747",
-   "self_type" : "type-6746",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24102,8 +24090,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6765",
-   "self_type" : "type-6764",
+   "referenced_type" : "type-6596",
+   "self_type" : "type-6595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24111,8 +24099,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6786",
-   "self_type" : "type-6785",
+   "referenced_type" : "type-6674",
+   "self_type" : "type-6673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24120,8 +24108,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6821",
-   "self_type" : "type-6820",
+   "referenced_type" : "type-6894",
+   "self_type" : "type-6893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24129,8 +24117,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24138,8 +24126,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24147,8 +24135,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7220",
-   "self_type" : "type-7219",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24156,8 +24144,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24165,17 +24153,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7275",
-   "self_type" : "type-7274",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7302",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7341",
+   "self_type" : "type-7340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24192,8 +24171,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7446",
-   "self_type" : "type-7445",
+   "referenced_type" : "type-7443",
+   "self_type" : "type-7442",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24201,8 +24180,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7455",
-   "self_type" : "type-7454",
+   "referenced_type" : "type-7479",
+   "self_type" : "type-7478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24210,8 +24189,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7567",
-   "self_type" : "type-7566",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24219,8 +24198,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7604",
-   "self_type" : "type-7603",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7677",
+   "self_type" : "type-7676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24264,8 +24261,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24273,8 +24270,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3017",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24282,8 +24279,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3460",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2072",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24291,8 +24288,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> > *",
-   "referenced_type" : "type-3439",
-   "self_type" : "type-3440",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2050",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24300,8 +24297,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2089",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24309,8 +24306,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2110",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24318,8 +24315,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2096",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24327,8 +24324,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3500",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2115",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24336,8 +24333,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24345,8 +24342,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2067",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24354,8 +24351,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2059",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24363,8 +24360,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
-   "referenced_type" : "type-3451",
-   "self_type" : "type-3452",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2063",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24372,8 +24369,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
-   "referenced_type" : "type-3443",
-   "self_type" : "type-3444",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2054",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24381,8 +24378,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3492",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2106",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24390,8 +24387,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3469",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2081",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24399,8 +24396,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2100",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24408,8 +24405,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24417,8 +24414,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24426,8 +24423,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3530",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24435,8 +24432,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> > *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3520",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24444,8 +24441,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
-   "referenced_type" : "type-3537",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24453,8 +24450,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3548",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24462,8 +24459,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
-   "referenced_type" : "type-3541",
-   "self_type" : "type-3542",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24471,8 +24468,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3550",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24480,8 +24477,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3536",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2154",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24489,8 +24486,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> > *",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3528",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2145",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24498,8 +24495,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24507,8 +24504,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3526",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2143",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24516,8 +24513,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3522",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2139",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24525,8 +24522,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3546",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24534,8 +24531,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-3533",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24543,8 +24540,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3544",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24552,8 +24549,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3532",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24561,8 +24558,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24597,8 +24594,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2990",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24606,8 +24603,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1720",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24634,7 +24631,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-163",
-   "self_type" : "type-1959",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24643,7 +24640,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-149",
-   "self_type" : "type-1954",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24652,7 +24649,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-141",
-   "self_type" : "type-1951",
+   "self_type" : "type-2668",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24661,7 +24658,7 @@
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
    "referenced_type" : "type-1240",
-   "self_type" : "type-1946",
+   "self_type" : "type-2663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24670,7 +24667,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-123",
-   "self_type" : "type-1940",
+   "self_type" : "type-1887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24678,8 +24675,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24687,8 +24684,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4892",
+   "self_type" : "type-4891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24696,8 +24693,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-6210",
-   "self_type" : "type-6209",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24705,8 +24702,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24741,8 +24738,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24759,8 +24756,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24768,8 +24765,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4045",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24777,8 +24774,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
    "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24786,8 +24783,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
    "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-4025",
-   "self_type" : "type-4029",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24795,8 +24792,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
    "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-4009",
-   "self_type" : "type-4023",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4683",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24804,8 +24801,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4071",
+   "referenced_type" : "type-4726",
+   "self_type" : "type-4731",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24813,8 +24810,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4735",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24822,8 +24819,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4049",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4709",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24831,8 +24828,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4050",
-   "self_type" : "type-4051",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4711",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24840,8 +24837,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4083",
+   "referenced_type" : "type-4737",
+   "self_type" : "type-4743",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24849,8 +24846,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-4084",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4749",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24858,8 +24855,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4053",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4718",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24867,8 +24864,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4719",
+   "self_type" : "type-4723",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24876,8 +24873,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-4163",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4825",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24885,8 +24882,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24903,8 +24900,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2817",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24921,8 +24918,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24930,8 +24927,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2839",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24939,8 +24936,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24948,8 +24945,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4810",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7523",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24957,8 +24954,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3705",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24966,8 +24963,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24975,8 +24972,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3711",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4369",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24984,8 +24981,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4498",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24993,8 +24990,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25011,8 +25008,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> *",
    "name" : "android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7527",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25075,7 +25072,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-382",
-   "self_type" : "type-4928",
+   "self_type" : "type-7640",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25084,7 +25081,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-373",
-   "self_type" : "type-3938",
+   "self_type" : "type-4598",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25093,7 +25090,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "referenced_type" : "type-391",
-   "self_type" : "type-3691",
+   "self_type" : "type-4349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25111,7 +25108,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-1739",
+   "self_type" : "type-2466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25128,8 +25125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25137,8 +25134,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4027",
-   "self_type" : "type-4026",
+   "referenced_type" : "type-4687",
+   "self_type" : "type-4686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25146,8 +25143,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7430",
-   "self_type" : "type-7429",
+   "referenced_type" : "type-7325",
+   "self_type" : "type-7324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25155,8 +25152,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25164,8 +25161,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6986",
-   "self_type" : "type-6985",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25173,8 +25170,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3807",
+   "referenced_type" : "type-4468",
+   "self_type" : "type-4467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25182,8 +25179,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7214",
-   "self_type" : "type-7213",
+   "referenced_type" : "type-7070",
+   "self_type" : "type-7069",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25192,7 +25189,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-1752",
+   "self_type" : "type-2479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25201,7 +25198,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-1746",
+   "self_type" : "type-2473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25209,8 +25206,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25218,8 +25215,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-4238",
-   "self_type" : "type-4237",
+   "referenced_type" : "type-4900",
+   "self_type" : "type-4899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25227,8 +25224,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25236,8 +25233,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6865",
-   "self_type" : "type-6864",
+   "referenced_type" : "type-7087",
+   "self_type" : "type-7086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25245,8 +25242,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-7656",
+   "self_type" : "type-7655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25254,8 +25251,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25263,8 +25260,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6982",
-   "self_type" : "type-6981",
+   "referenced_type" : "type-6852",
+   "self_type" : "type-6851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25272,8 +25269,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-3801",
-   "self_type" : "type-3800",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25281,8 +25278,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25290,8 +25287,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7210",
-   "self_type" : "type-7209",
+   "referenced_type" : "type-7511",
+   "self_type" : "type-7510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25354,7 +25351,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-463",
-   "self_type" : "type-4968",
+   "self_type" : "type-7685",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25363,7 +25360,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-454",
-   "self_type" : "type-3910",
+   "self_type" : "type-4570",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25372,7 +25369,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-3719",
+   "self_type" : "type-4378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25399,7 +25396,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-531",
-   "self_type" : "type-1720",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25408,7 +25405,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-534",
-   "self_type" : "type-1724",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25417,7 +25414,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-164",
-   "self_type" : "type-1906",
+   "self_type" : "type-2626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25426,7 +25423,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-150",
-   "self_type" : "type-1904",
+   "self_type" : "type-2624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25435,7 +25432,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-146",
-   "self_type" : "type-1902",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25453,7 +25450,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-1786",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25462,7 +25459,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-322",
-   "self_type" : "type-1517",
+   "self_type" : "type-2246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25471,7 +25468,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1425",
+   "self_type" : "type-1958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25479,8 +25476,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3619",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25488,8 +25485,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3797",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25507,7 +25504,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-1763",
+   "self_type" : "type-2490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25524,8 +25521,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25534,7 +25531,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-1779",
+   "self_type" : "type-2506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25561,7 +25558,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-1771",
+   "self_type" : "type-2498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25569,8 +25566,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25578,8 +25575,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3603",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25587,8 +25584,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3612",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25596,8 +25593,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4177",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25605,8 +25602,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5064",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25633,7 +25630,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-940",
-   "self_type" : "type-1815",
+   "self_type" : "type-2536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25642,7 +25639,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-1773",
+   "self_type" : "type-2500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25651,7 +25648,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-1759",
+   "self_type" : "type-2486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25669,7 +25666,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-958",
-   "self_type" : "type-1818",
+   "self_type" : "type-2539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25687,7 +25684,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-933",
-   "self_type" : "type-1718",
+   "self_type" : "type-1881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25695,8 +25692,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25704,8 +25701,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25713,8 +25710,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3622",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25722,8 +25719,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3809",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25731,8 +25728,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25740,8 +25737,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25749,8 +25746,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3620",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25758,8 +25755,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3802",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25768,7 +25765,7 @@
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-515",
-   "self_type" : "type-3733",
+   "self_type" : "type-4392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25776,8 +25773,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-3566",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-4224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25785,8 +25782,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25794,8 +25791,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25849,7 +25846,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-131",
-   "self_type" : "type-3624",
+   "self_type" : "type-4282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25858,7 +25855,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-173",
-   "self_type" : "type-3098",
+   "self_type" : "type-1668",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25884,8 +25881,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2849",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25911,8 +25908,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25920,8 +25917,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25929,8 +25926,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-1562",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25947,8 +25944,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25983,8 +25980,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-3820",
-   "self_type" : "type-3821",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4481",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -26028,8 +26025,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3634",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26037,8 +26034,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26046,8 +26043,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26055,8 +26052,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5607",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5709",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26064,8 +26061,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5657",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5761",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26073,8 +26070,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5765",
-   "self_type" : "type-5764",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26082,8 +26079,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6487",
-   "self_type" : "type-6486",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26091,8 +26088,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6533",
-   "self_type" : "type-6535",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26100,8 +26097,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6642",
-   "self_type" : "type-6641",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26118,8 +26115,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-3523",
+   "self_type" : "type-3525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26127,8 +26124,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5496",
-   "self_type" : "type-5498",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26136,8 +26133,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6386",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26154,8 +26151,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26163,8 +26160,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26172,8 +26169,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5488",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5590",
+   "self_type" : "type-5592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26181,8 +26178,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6380",
-   "self_type" : "type-6383",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26208,8 +26205,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26217,8 +26214,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26226,8 +26223,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2495",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-3595",
+   "self_type" : "type-3597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26235,8 +26232,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26244,8 +26241,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26253,8 +26250,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4015",
-   "self_type" : "type-4017",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26262,8 +26259,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4282",
+   "referenced_type" : "type-4944",
+   "self_type" : "type-4946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26271,8 +26268,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5421",
-   "self_type" : "type-5423",
+   "referenced_type" : "type-5523",
+   "self_type" : "type-5525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26280,8 +26277,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5568",
-   "self_type" : "type-5570",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5672",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26289,8 +26286,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5833",
-   "self_type" : "type-5840",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26298,8 +26295,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6227",
-   "self_type" : "type-6229",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26307,8 +26304,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6331",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6129",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26316,8 +26313,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6461",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6255",
+   "self_type" : "type-6257",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26325,8 +26322,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6690",
-   "self_type" : "type-6697",
+   "referenced_type" : "type-6455",
+   "self_type" : "type-6462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26334,8 +26331,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7078",
-   "self_type" : "type-7090",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26343,8 +26340,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7176",
-   "self_type" : "type-7183",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26361,8 +26358,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7421",
-   "self_type" : "type-7423",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7318",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26388,8 +26385,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26397,8 +26394,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> *",
    "name" : "const android::Flattenable<android::Fence> *",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26406,8 +26403,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26415,8 +26412,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
    "name" : "const android::Flattenable<android::GraphicBuffer> *",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3073",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26424,8 +26421,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3654",
-   "self_type" : "type-3655",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26433,8 +26430,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3658",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26442,8 +26439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameDropper *",
    "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26460,8 +26457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26469,8 +26466,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26478,8 +26475,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2502",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26487,8 +26484,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2800",
-   "self_type" : "type-2802",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26496,8 +26493,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2927",
+   "referenced_type" : "type-3900",
+   "self_type" : "type-3902",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26505,8 +26502,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3563",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26514,8 +26511,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4175",
-   "self_type" : "type-4211",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26523,8 +26520,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5427",
-   "self_type" : "type-5429",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4873",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26532,8 +26529,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5573",
-   "self_type" : "type-5575",
+   "referenced_type" : "type-5529",
+   "self_type" : "type-5531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26541,8 +26538,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5873",
-   "self_type" : "type-5875",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26550,8 +26547,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5966",
-   "self_type" : "type-5968",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5977",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26559,8 +26556,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6203",
-   "self_type" : "type-6208",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26568,8 +26565,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6336",
-   "self_type" : "type-6338",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6135",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26577,8 +26574,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6466",
-   "self_type" : "type-6468",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26586,8 +26583,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6658",
-   "self_type" : "type-6732",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26595,8 +26592,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6729",
-   "self_type" : "type-6731",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26604,8 +26601,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6808",
-   "self_type" : "type-6810",
+   "referenced_type" : "type-6826",
+   "self_type" : "type-6836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26613,8 +26610,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6962",
-   "self_type" : "type-6964",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26640,8 +26637,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26649,8 +26646,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-2971",
-   "self_type" : "type-2976",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26658,8 +26655,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26676,8 +26673,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26685,8 +26682,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26694,8 +26691,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3030",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26703,8 +26700,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5586",
-   "self_type" : "type-5588",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26712,8 +26709,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5733",
-   "self_type" : "type-5735",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26721,8 +26718,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6035",
-   "self_type" : "type-6037",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26730,8 +26727,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6473",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26739,8 +26736,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6610",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26748,8 +26745,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6855",
-   "self_type" : "type-6857",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26766,8 +26763,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26775,8 +26772,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2503",
+   "self_type" : "type-2505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26784,8 +26781,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3045",
-   "self_type" : "type-3047",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26793,8 +26790,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4255",
-   "self_type" : "type-4257",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4081",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26802,8 +26799,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5469",
-   "self_type" : "type-5471",
+   "referenced_type" : "type-4917",
+   "self_type" : "type-4919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26811,8 +26808,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6052",
-   "self_type" : "type-6054",
+   "referenced_type" : "type-5571",
+   "self_type" : "type-5573",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26820,8 +26817,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6220",
-   "self_type" : "type-6222",
+   "referenced_type" : "type-6009",
+   "self_type" : "type-6011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26829,8 +26826,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6366",
-   "self_type" : "type-6368",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26838,8 +26835,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6870",
-   "self_type" : "type-6873",
+   "referenced_type" : "type-6664",
+   "self_type" : "type-6666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26847,8 +26844,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6951",
-   "self_type" : "type-6953",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7153",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26865,8 +26862,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26874,8 +26871,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3592",
-   "self_type" : "type-3594",
+   "referenced_type" : "type-4250",
+   "self_type" : "type-4252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26883,8 +26880,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5479",
-   "self_type" : "type-5481",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26892,8 +26889,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6375",
-   "self_type" : "type-6377",
+   "referenced_type" : "type-6174",
+   "self_type" : "type-6176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26901,8 +26898,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6991",
-   "self_type" : "type-6993",
+   "referenced_type" : "type-6860",
+   "self_type" : "type-6862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26928,8 +26925,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26937,8 +26934,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26946,8 +26943,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26955,8 +26952,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26964,8 +26961,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4032",
-   "self_type" : "type-4034",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26973,8 +26970,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26982,8 +26979,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5740",
-   "self_type" : "type-5742",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26991,8 +26988,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6480",
-   "self_type" : "type-6482",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27000,8 +26997,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6617",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27009,8 +27006,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6998",
-   "self_type" : "type-7000",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27018,8 +27015,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7204",
-   "self_type" : "type-7203",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7058",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27027,8 +27024,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7434",
-   "self_type" : "type-7436",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27063,8 +27060,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-3930",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-4590",
+   "self_type" : "type-4591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27090,8 +27087,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27208,7 +27205,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-120",
-   "self_type" : "type-2964",
+   "self_type" : "type-1514",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27225,8 +27222,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2973",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27234,8 +27231,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27243,8 +27240,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3676",
-   "self_type" : "type-3677",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27252,8 +27249,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1658",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27261,8 +27258,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3681",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4340",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27270,8 +27267,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3686",
-   "self_type" : "type-3687",
+   "referenced_type" : "type-4344",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27297,8 +27294,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27306,8 +27303,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27315,8 +27312,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27324,8 +27321,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27333,8 +27330,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3637",
-   "self_type" : "type-3636",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4012",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27342,8 +27339,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3914",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27351,8 +27348,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4078",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27360,8 +27357,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4354",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4575",
+   "self_type" : "type-4574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27369,8 +27366,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4870",
-   "self_type" : "type-4869",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27378,8 +27375,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5014",
-   "self_type" : "type-5013",
+   "referenced_type" : "type-5022",
+   "self_type" : "type-5021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27387,8 +27384,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5760",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27396,8 +27393,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5985",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27405,8 +27402,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6065",
-   "self_type" : "type-6064",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27414,8 +27411,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27423,8 +27420,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27432,8 +27429,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27441,8 +27438,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27450,8 +27447,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7037",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27459,8 +27456,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7316",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27468,8 +27465,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7463",
-   "self_type" : "type-7462",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27477,8 +27474,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27486,8 +27483,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27495,8 +27492,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3002",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1553",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27504,8 +27501,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3292",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1889",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27522,8 +27519,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27531,8 +27528,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1958",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27540,8 +27537,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27550,7 +27547,7 @@
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
    "referenced_type" : "type-1248",
-   "self_type" : "type-1943",
+   "self_type" : "type-2660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27558,8 +27555,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1936",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27576,8 +27573,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27594,8 +27591,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27612,8 +27609,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27621,8 +27618,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-3999",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4665",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27630,8 +27627,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2597",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27648,8 +27645,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27657,8 +27654,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4955",
+   "referenced_type" : "type-7670",
+   "self_type" : "type-7671",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27666,8 +27663,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3708",
-   "self_type" : "type-3709",
+   "referenced_type" : "type-4366",
+   "self_type" : "type-4367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27675,8 +27672,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
-   "referenced_type" : "type-3835",
-   "self_type" : "type-3836",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27684,8 +27681,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3714",
-   "self_type" : "type-3715",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27693,8 +27690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "referenced_type" : "type-3841",
-   "self_type" : "type-3842",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4502",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27702,8 +27699,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3703",
+   "referenced_type" : "type-4360",
+   "self_type" : "type-4361",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27711,8 +27708,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4701",
+   "self_type" : "type-4703",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27720,8 +27717,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<unsigned long> *",
    "name" : "const android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-4956",
-   "self_type" : "type-4957",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7673",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27783,8 +27780,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-3693",
-   "self_type" : "type-3694",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4352",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27810,8 +27807,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1735",
-   "self_type" : "type-1737",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27837,8 +27834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
    "name" : "const android::hardware::hidl_array<float, 16> *",
-   "referenced_type" : "type-4068",
-   "self_type" : "type-4070",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4730",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27900,8 +27897,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-3724",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27936,8 +27933,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27945,8 +27942,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27954,8 +27951,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27964,7 +27961,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-1311",
-   "self_type" : "type-1788",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27973,7 +27970,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-1550",
+   "self_type" : "type-2279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27981,8 +27978,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2205",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27999,8 +27996,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28017,8 +28014,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28026,8 +28023,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28044,8 +28041,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28053,8 +28050,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3609",
-   "self_type" : "type-3608",
+   "referenced_type" : "type-4267",
+   "self_type" : "type-4266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28062,8 +28059,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28071,8 +28068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4180",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28080,8 +28077,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5055",
-   "self_type" : "type-5067",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28089,8 +28086,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
    "name" : "const android::sp<android::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28117,7 +28114,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-790",
-   "self_type" : "type-1775",
+   "self_type" : "type-2502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28125,8 +28122,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28134,8 +28131,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2948",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28153,7 +28150,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-935",
-   "self_type" : "type-3039",
+   "self_type" : "type-1598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28161,8 +28158,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28170,8 +28167,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28179,8 +28176,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3584",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28188,8 +28185,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28197,8 +28194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28206,8 +28203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28215,8 +28212,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3578",
-   "self_type" : "type-3621",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28224,8 +28221,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28234,7 +28231,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-514",
-   "self_type" : "type-1716",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28242,8 +28239,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28251,8 +28248,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28287,8 +28284,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
    "name" : "const android::wp<android::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28332,8 +28329,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2321",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28360,7 +28357,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4067",
+   "self_type" : "type-4727",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28368,8 +28365,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4102",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4765",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28377,8 +28374,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4204",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4866",
+   "self_type" : "type-4868",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28386,8 +28383,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4883",
-   "self_type" : "type-4886",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5091",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28395,8 +28392,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5027",
+   "referenced_type" : "type-5138",
+   "self_type" : "type-5140",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28404,8 +28401,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5098",
-   "self_type" : "type-5100",
+   "referenced_type" : "type-7374",
+   "self_type" : "type-7376",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28413,8 +28410,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7484",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7470",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28422,8 +28419,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7593",
-   "self_type" : "type-7595",
+   "referenced_type" : "type-7596",
+   "self_type" : "type-7598",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28486,7 +28483,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1903",
+   "self_type" : "type-1510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28494,8 +28491,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2343",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28522,7 +28519,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4074",
+   "self_type" : "type-4734",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28530,8 +28527,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3014",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1566",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28539,8 +28536,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28548,8 +28545,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6025",
-   "self_type" : "type-6024",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28557,8 +28554,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6135",
-   "self_type" : "type-6134",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28566,8 +28563,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6847",
-   "self_type" : "type-6846",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28575,8 +28572,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6931",
-   "self_type" : "type-6930",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28584,8 +28581,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28593,8 +28590,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-6120",
-   "self_type" : "type-6119",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28602,8 +28599,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-6919",
-   "self_type" : "type-6918",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28611,8 +28608,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3018",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28620,8 +28617,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28629,8 +28626,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-6849",
-   "self_type" : "type-6848",
+   "referenced_type" : "type-6643",
+   "self_type" : "type-6642",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28638,8 +28635,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28647,8 +28644,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-6165",
-   "self_type" : "type-6164",
+   "referenced_type" : "type-4192",
+   "self_type" : "type-4191",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28656,8 +28653,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-6950",
-   "self_type" : "type-6949",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6791",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28665,8 +28662,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-3475",
-   "self_type" : "type-3474",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28674,8 +28671,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-6145",
-   "self_type" : "type-6144",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28683,8 +28680,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-6937",
-   "self_type" : "type-6936",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28692,8 +28689,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-3479",
-   "self_type" : "type-3478",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28701,8 +28698,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-6148",
-   "self_type" : "type-6147",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4174",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28710,8 +28707,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-6939",
-   "self_type" : "type-6938",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28719,8 +28716,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28728,8 +28725,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28737,8 +28734,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-6948",
-   "self_type" : "type-6947",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6787",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28746,8 +28743,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28755,8 +28752,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-6152",
-   "self_type" : "type-6151",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28764,8 +28761,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-6941",
-   "self_type" : "type-6940",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28773,8 +28770,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-3450",
-   "self_type" : "type-3449",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28782,8 +28779,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-6126",
-   "self_type" : "type-6125",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28791,8 +28788,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-6924",
-   "self_type" : "type-6923",
+   "referenced_type" : "type-6752",
+   "self_type" : "type-6751",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28800,8 +28797,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3453",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28809,8 +28806,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-6129",
-   "self_type" : "type-6128",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28818,8 +28815,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-6926",
-   "self_type" : "type-6925",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28827,8 +28824,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-3446",
-   "self_type" : "type-3445",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28836,8 +28833,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-6123",
-   "self_type" : "type-6122",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28845,8 +28842,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-6921",
-   "self_type" : "type-6920",
+   "referenced_type" : "type-6749",
+   "self_type" : "type-6748",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28854,8 +28851,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28863,8 +28860,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-6132",
-   "self_type" : "type-6131",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28872,8 +28869,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-6928",
-   "self_type" : "type-6927",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28881,8 +28878,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28890,8 +28887,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-6159",
-   "self_type" : "type-6158",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28899,8 +28896,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-6946",
-   "self_type" : "type-6945",
+   "referenced_type" : "type-6785",
+   "self_type" : "type-6784",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28908,8 +28905,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-3471",
-   "self_type" : "type-3470",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28917,8 +28914,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-6142",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28926,8 +28923,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-6935",
-   "self_type" : "type-6934",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28935,8 +28932,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28944,8 +28941,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-6156",
-   "self_type" : "type-6155",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28953,8 +28950,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28962,8 +28959,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28971,8 +28968,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28980,8 +28977,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6933",
-   "self_type" : "type-6932",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28989,8 +28986,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3081",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28998,8 +28995,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6086",
-   "self_type" : "type-6085",
+   "referenced_type" : "type-4113",
+   "self_type" : "type-4112",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29007,8 +29004,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6902",
-   "self_type" : "type-6901",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29016,8 +29013,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-2362",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29035,7 +29032,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-3110",
+   "self_type" : "type-1682",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29044,7 +29041,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-11",
-   "self_type" : "type-3107",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29070,8 +29067,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-2838",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29131,8 +29128,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29141,8 +29138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29151,8 +29148,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1422",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29161,8 +29158,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1443",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29171,8 +29168,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2590",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29181,8 +29178,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29191,8 +29188,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29201,8 +29198,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29211,8 +29208,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29221,8 +29218,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2881",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29231,8 +29228,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2905",
-   "self_type" : "type-2907",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29241,8 +29238,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2941",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29251,8 +29248,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3843",
+   "self_type" : "type-3842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29261,8 +29258,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3631",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29271,8 +29268,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3816",
-   "self_type" : "type-3818",
+   "referenced_type" : "type-3933",
+   "self_type" : "type-3935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29281,8 +29278,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3869",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3948",
+   "self_type" : "type-3950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29291,8 +29288,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3877",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3974",
+   "self_type" : "type-3976",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29301,8 +29298,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3903",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-4007",
+   "self_type" : "type-4009",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29311,8 +29308,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4054",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4088",
+   "self_type" : "type-4090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29321,8 +29318,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4182",
-   "self_type" : "type-4184",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29331,8 +29328,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4329",
-   "self_type" : "type-4331",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29341,8 +29338,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4817",
-   "self_type" : "type-4819",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29351,8 +29348,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4899",
-   "self_type" : "type-4901",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29361,8 +29358,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4962",
-   "self_type" : "type-4964",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29371,8 +29368,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5070",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-4714",
+   "self_type" : "type-4716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29381,8 +29378,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5118",
-   "self_type" : "type-5120",
+   "referenced_type" : "type-4844",
+   "self_type" : "type-4846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29391,8 +29388,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5431",
-   "self_type" : "type-5433",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29401,8 +29398,28 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5499",
-   "self_type" : "type-5501",
+   "referenced_type" : "type-5120",
+   "self_type" : "type-5122",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5161",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29421,16 +29438,6 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5663",
-   "self_type" : "type-5665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
    "size" : 8,
@@ -29441,8 +29448,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5755",
-   "self_type" : "type-5757",
+   "referenced_type" : "type-5703",
+   "self_type" : "type-5705",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29451,8 +29458,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5765",
+   "self_type" : "type-5767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29461,8 +29468,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5880",
-   "self_type" : "type-5882",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29471,28 +29478,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5906",
-   "self_type" : "type-5908",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5921",
-   "self_type" : "type-5923",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5947",
-   "self_type" : "type-5949",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29511,8 +29498,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6061",
-   "self_type" : "type-6063",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6042",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29521,8 +29508,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6192",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29531,8 +29518,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6250",
-   "self_type" : "type-6252",
+   "referenced_type" : "type-6188",
+   "self_type" : "type-6190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29541,8 +29528,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6339",
-   "self_type" : "type-6341",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29551,8 +29538,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6391",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29561,8 +29548,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6483",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29571,8 +29558,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6537",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29581,8 +29568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6635",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29591,8 +29578,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6735",
-   "self_type" : "type-6737",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29601,8 +29588,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6746",
-   "self_type" : "type-6748",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29611,8 +29598,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6764",
-   "self_type" : "type-6766",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29621,8 +29608,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6785",
-   "self_type" : "type-6787",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29631,8 +29618,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6820",
-   "self_type" : "type-6822",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6895",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29641,8 +29628,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6883",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29651,8 +29638,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7030",
-   "self_type" : "type-7032",
+   "referenced_type" : "type-7139",
+   "self_type" : "type-7141",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29661,8 +29648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7219",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7154",
+   "self_type" : "type-7157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29671,8 +29658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7267",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7191",
+   "self_type" : "type-7193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29681,18 +29668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7274",
-   "self_type" : "type-7276",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7301",
-   "self_type" : "type-7303",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29711,8 +29688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7445",
-   "self_type" : "type-7447",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29721,8 +29698,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7454",
-   "self_type" : "type-7458",
+   "referenced_type" : "type-7478",
+   "self_type" : "type-7481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29731,8 +29708,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7566",
-   "self_type" : "type-7568",
+   "referenced_type" : "type-7533",
+   "self_type" : "type-7535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29741,8 +29718,28 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7603",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7584",
+   "self_type" : "type-7595",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7615",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7676",
+   "self_type" : "type-7681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29771,8 +29768,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1373",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29782,7 +29779,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-1793",
+   "self_type" : "type-2520",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29792,7 +29789,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-1789",
+   "self_type" : "type-2516",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29802,7 +29799,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-1562",
+   "self_type" : "type-2291",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29822,7 +29819,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-1438",
+   "self_type" : "type-2101",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29862,7 +29859,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-82",
-   "self_type" : "type-3820",
+   "self_type" : "type-4480",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29911,8 +29908,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1672",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29921,8 +29938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29931,8 +29948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29941,8 +29958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29951,8 +29968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2980",
-   "self_type" : "type-2979",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29961,8 +29978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3102",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-4129",
+   "self_type" : "type-4128",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29971,8 +29988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5415",
-   "self_type" : "type-5414",
+   "referenced_type" : "type-5517",
+   "self_type" : "type-5516",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29981,8 +29998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5609",
-   "self_type" : "type-5608",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29991,8 +30008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30001,8 +30018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30011,28 +30028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6015",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6102",
-   "self_type" : "type-6101",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6327",
-   "self_type" : "type-6326",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30041,8 +30038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6488",
-   "self_type" : "type-6487",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30051,8 +30048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30061,8 +30058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6643",
-   "self_type" : "type-6642",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30071,6 +30068,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
+   "referenced_type" : "type-6633",
+   "self_type" : "type-6632",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
    "referenced_type" : "type-682",
    "self_type" : "type-681",
    "size" : 216,
@@ -30081,26 +30098,6 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6912",
-   "self_type" : "type-6911",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
    "referenced_type" : "type-984",
    "self_type" : "type-983",
    "size" : 216,
@@ -30111,8 +30108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30121,8 +30118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5497",
-   "self_type" : "type-5496",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30131,8 +30128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6184",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30152,7 +30149,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-1769",
+   "self_type" : "type-2496",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30161,8 +30158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-2886",
-   "self_type" : "type-2885",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30171,8 +30168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-5928",
-   "self_type" : "type-5927",
+   "referenced_type" : "type-3955",
+   "self_type" : "type-3954",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30181,8 +30178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6770",
-   "self_type" : "type-6769",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30191,8 +30188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30201,8 +30198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30211,8 +30208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6381",
-   "self_type" : "type-6380",
+   "referenced_type" : "type-6180",
+   "self_type" : "type-6179",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30241,8 +30238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30251,8 +30248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30261,8 +30258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30271,8 +30268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2761",
-   "self_type" : "type-2760",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30281,8 +30278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3767",
-   "self_type" : "type-3766",
+   "referenced_type" : "type-4426",
+   "self_type" : "type-4425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30291,8 +30288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4016",
-   "self_type" : "type-4015",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30301,8 +30298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4281",
-   "self_type" : "type-4280",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30311,8 +30308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5422",
-   "self_type" : "type-5421",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30321,8 +30318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5569",
-   "self_type" : "type-5568",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30331,8 +30328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30341,8 +30338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6228",
-   "self_type" : "type-6227",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30351,8 +30348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6332",
-   "self_type" : "type-6331",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30361,8 +30358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30371,8 +30368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6691",
-   "self_type" : "type-6690",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30381,8 +30378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7079",
-   "self_type" : "type-7078",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30391,8 +30388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7177",
-   "self_type" : "type-7176",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30411,8 +30408,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7422",
-   "self_type" : "type-7421",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30431,8 +30428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-3923",
-   "self_type" : "type-3922",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30441,8 +30438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4091",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30451,8 +30448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-7326",
-   "self_type" : "type-7325",
+   "referenced_type" : "type-7218",
+   "self_type" : "type-7217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30461,8 +30458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-7474",
-   "self_type" : "type-7473",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30482,7 +30479,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-22",
-   "self_type" : "type-2957",
+   "self_type" : "type-1507",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30492,7 +30489,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-17",
-   "self_type" : "type-3069",
+   "self_type" : "type-1635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30502,7 +30499,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-26",
-   "self_type" : "type-3651",
+   "self_type" : "type-4309",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30512,7 +30509,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-15",
-   "self_type" : "type-3072",
+   "self_type" : "type-1639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30522,7 +30519,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-33",
-   "self_type" : "type-3654",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30532,7 +30529,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-35",
-   "self_type" : "type-3657",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30542,7 +30539,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-1784",
+   "self_type" : "type-2511",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30561,8 +30558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30571,8 +30568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30581,8 +30578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30591,8 +30588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30601,8 +30598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2926",
-   "self_type" : "type-2925",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30611,8 +30608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30621,8 +30618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4176",
-   "self_type" : "type-4175",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4221",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30631,8 +30628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5428",
-   "self_type" : "type-5427",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4837",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30641,8 +30638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30651,8 +30648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30661,8 +30658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5967",
-   "self_type" : "type-5966",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30671,8 +30668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6204",
-   "self_type" : "type-6203",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30681,8 +30678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30691,8 +30688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6467",
-   "self_type" : "type-6466",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30701,8 +30698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6659",
-   "self_type" : "type-6658",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30711,8 +30708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6730",
-   "self_type" : "type-6729",
+   "referenced_type" : "type-6582",
+   "self_type" : "type-6581",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30721,8 +30718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6809",
-   "self_type" : "type-6808",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30731,8 +30728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6963",
-   "self_type" : "type-6962",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30762,7 +30759,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-1827",
+   "self_type" : "type-2548",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30792,7 +30789,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-53",
-   "self_type" : "type-2971",
+   "self_type" : "type-1520",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30802,7 +30799,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-176",
-   "self_type" : "type-3660",
+   "self_type" : "type-4318",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30821,8 +30818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30831,8 +30828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-2661",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3613",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30841,8 +30838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30851,8 +30848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5587",
-   "self_type" : "type-5586",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30861,8 +30858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5734",
-   "self_type" : "type-5733",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30871,8 +30868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6036",
-   "self_type" : "type-6035",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30881,8 +30878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6474",
-   "self_type" : "type-6473",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30891,8 +30888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6611",
-   "self_type" : "type-6610",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30901,8 +30898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6856",
-   "self_type" : "type-6855",
+   "referenced_type" : "type-6650",
+   "self_type" : "type-6649",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30921,8 +30918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30931,8 +30928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30941,8 +30938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3045",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30951,8 +30948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4256",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30961,8 +30958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5470",
-   "self_type" : "type-5469",
+   "referenced_type" : "type-4918",
+   "self_type" : "type-4917",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30971,8 +30968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6053",
-   "self_type" : "type-6052",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30981,8 +30978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30991,8 +30988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6367",
-   "self_type" : "type-6366",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31001,8 +30998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6871",
-   "self_type" : "type-6870",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31011,8 +31008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6952",
-   "self_type" : "type-6951",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31031,8 +31028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31041,8 +31038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3592",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31051,8 +31048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5480",
-   "self_type" : "type-5479",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31061,8 +31058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6376",
-   "self_type" : "type-6375",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31071,8 +31068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6992",
-   "self_type" : "type-6991",
+   "referenced_type" : "type-6861",
+   "self_type" : "type-6860",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31101,8 +31098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31111,8 +31108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31121,8 +31118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31131,8 +31128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3794",
-   "self_type" : "type-3793",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,8 +31138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4033",
-   "self_type" : "type-4032",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31151,8 +31148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5599",
-   "self_type" : "type-5598",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31161,8 +31158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5843",
+   "self_type" : "type-5842",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31171,8 +31168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6481",
-   "self_type" : "type-6480",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31181,8 +31178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6616",
-   "self_type" : "type-6615",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31191,8 +31188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6999",
-   "self_type" : "type-6998",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31201,8 +31198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7205",
-   "self_type" : "type-7204",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31211,8 +31208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7435",
-   "self_type" : "type-7434",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31252,7 +31249,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-48",
-   "self_type" : "type-3930",
+   "self_type" : "type-4590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31282,7 +31279,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-522",
-   "self_type" : "type-1948",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31431,8 +31428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
    "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1521",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31441,8 +31438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
    "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1662",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31451,8 +31448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4334",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31461,8 +31458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1657",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31471,8 +31468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3681",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4339",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31481,8 +31478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4344",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31521,8 +31518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31531,8 +31528,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1622",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31541,8 +31558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2689",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31551,8 +31568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31561,8 +31578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3058",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31571,8 +31588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31581,8 +31598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3916",
-   "self_type" : "type-3915",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31591,8 +31608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4739",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31601,8 +31618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4355",
-   "self_type" : "type-4354",
+   "referenced_type" : "type-5023",
+   "self_type" : "type-5022",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31611,8 +31628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4871",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-5081",
+   "self_type" : "type-5080",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31621,18 +31638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5015",
-   "self_type" : "type-5014",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-5440",
-   "self_type" : "type-5439",
+   "referenced_type" : "type-5542",
+   "self_type" : "type-5541",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31641,8 +31648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5762",
-   "self_type" : "type-5761",
+   "referenced_type" : "type-5864",
+   "self_type" : "type-5863",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31651,8 +31658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5987",
-   "self_type" : "type-5986",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6046",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31661,28 +31668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6066",
-   "self_type" : "type-6065",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-6255",
-   "self_type" : "type-6254",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31691,8 +31678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6638",
-   "self_type" : "type-6637",
+   "referenced_type" : "type-6411",
+   "self_type" : "type-6410",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31701,8 +31688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6828",
-   "self_type" : "type-6827",
+   "referenced_type" : "type-6601",
+   "self_type" : "type-6600",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31711,8 +31698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6888",
-   "self_type" : "type-6887",
+   "referenced_type" : "type-6680",
+   "self_type" : "type-6679",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31721,8 +31708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7038",
-   "self_type" : "type-7037",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31731,8 +31718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7318",
-   "self_type" : "type-7317",
+   "referenced_type" : "type-7210",
+   "self_type" : "type-7209",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31741,8 +31728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7464",
-   "self_type" : "type-7463",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7356",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31751,8 +31738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7586",
-   "self_type" : "type-7585",
+   "referenced_type" : "type-7583",
+   "self_type" : "type-7582",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31767,12 +31754,22 @@
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-7680",
+   "self_type" : "type-7679",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-54",
-   "self_type" : "type-1351",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31781,8 +31778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1552",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31791,8 +31788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1888",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31812,7 +31809,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-163",
-   "self_type" : "type-1960",
+   "self_type" : "type-2677",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31822,7 +31819,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-149",
-   "self_type" : "type-1956",
+   "self_type" : "type-2673",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31832,7 +31829,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-141",
-   "self_type" : "type-1952",
+   "self_type" : "type-2669",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31852,7 +31849,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-123",
-   "self_type" : "type-1935",
+   "self_type" : "type-1877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31871,8 +31868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2681",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31891,8 +31888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31912,7 +31909,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-143",
-   "self_type" : "type-1949",
+   "self_type" : "type-2666",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31921,8 +31918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-3999",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31931,8 +31928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2582",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31951,8 +31948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1375",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31961,8 +31958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2843",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1386",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31971,8 +31968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4953",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7670",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31981,8 +31978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3708",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4366",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31991,8 +31988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4495",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32001,8 +31998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4372",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32011,8 +32008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4501",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32021,8 +32018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3702",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4360",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32032,7 +32029,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-415",
-   "self_type" : "type-4041",
+   "self_type" : "type-4701",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32041,8 +32038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<unsigned long>",
    "name" : "const android::hardware::Return<unsigned long>",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4956",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7672",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32112,7 +32109,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-391",
-   "self_type" : "type-3693",
+   "self_type" : "type-4351",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32142,7 +32139,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-3925",
+   "self_type" : "type-4585",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32181,8 +32178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2462",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32412,7 +32409,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
    "name" : "const android::hardware::hidl_array<float, 16>",
    "referenced_type" : "type-484",
-   "self_type" : "type-4068",
+   "self_type" : "type-4728",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32502,7 +32499,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
    "referenced_type" : "type-453",
-   "self_type" : "type-3724",
+   "self_type" : "type-4383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32562,7 +32559,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-164",
-   "self_type" : "type-1900",
+   "self_type" : "type-2621",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32572,7 +32569,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-150",
-   "self_type" : "type-1898",
+   "self_type" : "type-2619",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32582,7 +32579,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-146",
-   "self_type" : "type-1894",
+   "self_type" : "type-2615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32590,32 +32587,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-4187",
-   "self_type" : "type-4186",
+   "referenced_type" : "type-4849",
+   "self_type" : "type-4848",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-6206",
-   "self_type" : "type-6205",
+   "referenced_type" : "type-5995",
+   "self_type" : "type-5994",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-6671",
-   "self_type" : "type-6670",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32644,7 +32641,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-1448",
+   "self_type" : "type-2177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32653,8 +32650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
    "name" : "const android::sp<android::BpGraphicBufferProducer>",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32663,8 +32660,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::BpProducerListener>",
    "name" : "const android::sp<android::BpProducerListener>",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32684,7 +32681,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-1766",
+   "self_type" : "type-2493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32703,8 +32700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32714,7 +32711,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-1781",
+   "self_type" : "type-2508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32743,8 +32740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32753,8 +32750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3609",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32763,8 +32760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3618",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4276",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32773,8 +32770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4167",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32783,8 +32780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5055",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32794,7 +32791,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-844",
-   "self_type" : "type-3645",
+   "self_type" : "type-4303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32834,7 +32831,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-1760",
+   "self_type" : "type-2487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32844,7 +32841,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-2943",
+   "self_type" : "type-1488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32893,8 +32890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1390",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32903,8 +32900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32913,8 +32910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32923,8 +32920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32933,8 +32930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32943,8 +32940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3813",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32953,8 +32950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32963,8 +32960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32973,8 +32970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32983,8 +32980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3806",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33003,8 +33000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33013,8 +33010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33054,7 +33051,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-174",
-   "self_type" : "type-3635",
+   "self_type" : "type-4293",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33064,7 +33061,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-131",
-   "self_type" : "type-3625",
+   "self_type" : "type-4283",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33074,7 +33071,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-306",
-   "self_type" : "type-2934",
+   "self_type" : "type-1473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33094,7 +33091,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-2932",
+   "self_type" : "type-1471",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33196,88 +33193,56 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2613",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-3835",
+   "self_type" : "type-3834",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3717",
-   "self_type" : "type-3716",
+   "referenced_type" : "type-4376",
+   "self_type" : "type-4375",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3845",
-   "self_type" : "type-3844",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-3907",
-   "self_type" : "type-3906",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-4189",
-   "self_type" : "type-4188",
+   "referenced_type" : "type-4505",
+   "self_type" : "type-4504",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33292,176 +33257,208 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4777",
-   "self_type" : "type-4776",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4903",
-   "self_type" : "type-4902",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4720",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4966",
-   "self_type" : "type-4965",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5076",
-   "self_type" : "type-5075",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5142",
-   "self_type" : "type-5141",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5281",
-   "self_type" : "type-5280",
+   "referenced_type" : "type-5383",
+   "self_type" : "type-5382",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5514",
-   "self_type" : "type-5513",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5623",
-   "self_type" : "type-5622",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5724",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5686",
-   "self_type" : "type-5685",
+   "referenced_type" : "type-5788",
+   "self_type" : "type-5787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5910",
+   "self_type" : "type-5909",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6276",
-   "self_type" : "type-6275",
+   "referenced_type" : "type-6068",
+   "self_type" : "type-6067",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6408",
-   "self_type" : "type-6407",
+   "referenced_type" : "type-6202",
+   "self_type" : "type-6201",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6504",
-   "self_type" : "type-6503",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6667",
-   "self_type" : "type-6666",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7119",
-   "self_type" : "type-7118",
+   "referenced_type" : "type-6973",
+   "self_type" : "type-6972",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7243",
-   "self_type" : "type-7242",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7278",
-   "self_type" : "type-7277",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7196",
+   "self_type" : "type-7195",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7450",
-   "self_type" : "type-7449",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7572",
-   "self_type" : "type-7571",
+   "referenced_type" : "type-7446",
+   "self_type" : "type-7445",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7483",
+   "self_type" : "type-7482",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7537",
+   "self_type" : "type-7536",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7617",
+   "self_type" : "type-7616",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7683",
+   "self_type" : "type-7682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33477,8 +33474,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2315",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33537,8 +33534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33547,8 +33544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2464",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33557,8 +33554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33567,8 +33564,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-4418",
+   "self_type" : "type-4417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33577,8 +33574,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-4627",
+   "self_type" : "type-4626",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33587,8 +33584,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-4135",
-   "self_type" : "type-4134",
+   "referenced_type" : "type-4797",
+   "self_type" : "type-4796",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33597,8 +33594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-4896",
-   "self_type" : "type-4895",
+   "referenced_type" : "type-5101",
+   "self_type" : "type-5100",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33607,8 +33604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5043",
-   "self_type" : "type-5042",
+   "referenced_type" : "type-5203",
+   "self_type" : "type-5202",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33617,8 +33614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5467",
+   "self_type" : "type-5466",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33627,8 +33624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5365",
-   "self_type" : "type-5364",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33637,18 +33634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5537",
-   "self_type" : "type-5536",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33667,8 +33654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33677,8 +33664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6432",
-   "self_type" : "type-6431",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33687,8 +33674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6696",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6461",
+   "self_type" : "type-6460",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33697,8 +33684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7168",
-   "self_type" : "type-7167",
+   "referenced_type" : "type-7021",
+   "self_type" : "type-7020",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33707,8 +33694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7372",
-   "self_type" : "type-7371",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7267",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33717,8 +33704,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7514",
-   "self_type" : "type-7513",
+   "referenced_type" : "type-7403",
+   "self_type" : "type-7402",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
+   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33747,8 +33744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3389",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33757,8 +33754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33767,8 +33764,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33777,8 +33774,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-4414",
+   "self_type" : "type-4413",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33787,8 +33784,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-4625",
+   "self_type" : "type-4624",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33797,8 +33794,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-4133",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4795",
+   "self_type" : "type-4794",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33807,8 +33804,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-4894",
-   "self_type" : "type-4893",
+   "referenced_type" : "type-5099",
+   "self_type" : "type-5098",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33817,8 +33814,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5041",
-   "self_type" : "type-5040",
+   "referenced_type" : "type-5201",
+   "self_type" : "type-5200",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33827,8 +33824,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5167",
-   "self_type" : "type-5166",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5464",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33837,8 +33834,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5363",
-   "self_type" : "type-5362",
+   "referenced_type" : "type-5637",
+   "self_type" : "type-5636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33847,18 +33844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5535",
-   "self_type" : "type-5534",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5837",
-   "self_type" : "type-5836",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33877,8 +33864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6296",
-   "self_type" : "type-6295",
+   "referenced_type" : "type-6091",
+   "self_type" : "type-6090",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33887,8 +33874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6430",
-   "self_type" : "type-6429",
+   "referenced_type" : "type-6223",
+   "self_type" : "type-6222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33897,8 +33884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6692",
+   "referenced_type" : "type-6459",
+   "self_type" : "type-6458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33907,8 +33894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7163",
-   "self_type" : "type-7162",
+   "referenced_type" : "type-7017",
+   "self_type" : "type-7016",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33917,8 +33904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7370",
-   "self_type" : "type-7369",
+   "referenced_type" : "type-7266",
+   "self_type" : "type-7265",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33927,8 +33914,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7512",
-   "self_type" : "type-7511",
+   "referenced_type" : "type-7401",
+   "self_type" : "type-7400",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
+   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33957,8 +33954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33967,8 +33964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3569",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33977,8 +33974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2773",
-   "self_type" : "type-2772",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33987,8 +33984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3764",
+   "referenced_type" : "type-4424",
+   "self_type" : "type-4423",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33997,8 +33994,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34007,8 +34004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-4141",
-   "self_type" : "type-4140",
+   "referenced_type" : "type-4803",
+   "self_type" : "type-4802",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34017,8 +34014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-4828",
-   "self_type" : "type-4827",
+   "referenced_type" : "type-5107",
+   "self_type" : "type-5106",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34027,8 +34024,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5050",
-   "self_type" : "type-5049",
+   "referenced_type" : "type-5210",
+   "self_type" : "type-5209",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34037,8 +34034,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5176",
-   "self_type" : "type-5175",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5478",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34047,8 +34044,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5377",
-   "self_type" : "type-5376",
+   "referenced_type" : "type-5645",
+   "self_type" : "type-5644",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34057,8 +34054,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5543",
-   "self_type" : "type-5542",
+   "referenced_type" : "type-5948",
+   "self_type" : "type-5947",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34067,8 +34064,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5846",
-   "self_type" : "type-5845",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34087,8 +34084,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6305",
-   "self_type" : "type-6304",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34097,8 +34094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6438",
-   "self_type" : "type-6437",
+   "referenced_type" : "type-6468",
+   "self_type" : "type-6467",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34107,8 +34104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6703",
-   "self_type" : "type-6702",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34117,8 +34114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7175",
-   "self_type" : "type-7174",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34127,8 +34124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34137,8 +34134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7521",
-   "self_type" : "type-7520",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34167,8 +34164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34177,8 +34174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34187,8 +34184,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2770",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34197,8 +34194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-3763",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34207,8 +34204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-4631",
+   "self_type" : "type-4630",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34217,8 +34214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-4139",
-   "self_type" : "type-4138",
+   "referenced_type" : "type-4801",
+   "self_type" : "type-4800",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34227,8 +34224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-4826",
-   "self_type" : "type-4825",
+   "referenced_type" : "type-5105",
+   "self_type" : "type-5104",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34237,8 +34234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5048",
-   "self_type" : "type-5047",
+   "referenced_type" : "type-5208",
+   "self_type" : "type-5207",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34247,8 +34244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5174",
-   "self_type" : "type-5173",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34257,8 +34254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5375",
-   "self_type" : "type-5374",
+   "referenced_type" : "type-5643",
+   "self_type" : "type-5642",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34267,8 +34264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5540",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34277,8 +34274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5844",
-   "self_type" : "type-5843",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34297,8 +34294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6303",
-   "self_type" : "type-6302",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34307,8 +34304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6436",
-   "self_type" : "type-6435",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34317,8 +34314,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6701",
-   "self_type" : "type-6700",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34327,8 +34324,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7173",
-   "self_type" : "type-7172",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34337,8 +34334,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7376",
-   "self_type" : "type-7375",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34347,8 +34344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7519",
-   "self_type" : "type-7518",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7541",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34377,8 +34374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34387,8 +34384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2466",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34397,8 +34394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2769",
-   "self_type" : "type-2768",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3868",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34407,8 +34404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-4420",
+   "self_type" : "type-4419",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34417,8 +34414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-4629",
+   "self_type" : "type-4628",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34427,8 +34424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-4137",
-   "self_type" : "type-4136",
+   "referenced_type" : "type-4799",
+   "self_type" : "type-4798",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34437,8 +34434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-4824",
-   "self_type" : "type-4823",
+   "referenced_type" : "type-5103",
+   "self_type" : "type-5102",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34447,8 +34444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5045",
-   "self_type" : "type-5044",
+   "referenced_type" : "type-5206",
+   "self_type" : "type-5205",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34457,8 +34454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34467,8 +34464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5373",
-   "self_type" : "type-5372",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34477,8 +34474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5944",
+   "self_type" : "type-5943",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34487,8 +34484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34507,8 +34504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34517,8 +34514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6434",
-   "self_type" : "type-6433",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34527,8 +34524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-7024",
+   "self_type" : "type-7023",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34537,8 +34534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7170",
-   "self_type" : "type-7169",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34547,8 +34544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7374",
-   "self_type" : "type-7373",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34557,8 +34554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7516",
-   "self_type" : "type-7515",
+   "referenced_type" : "type-7540",
+   "self_type" : "type-7539",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34597,8 +34594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3370",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34607,8 +34604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34617,8 +34614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34627,8 +34624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3848",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34637,8 +34634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34647,8 +34644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3950",
-   "self_type" : "type-3949",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4609",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34657,8 +34654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-4120",
-   "self_type" : "type-4119",
+   "referenced_type" : "type-4782",
+   "self_type" : "type-4781",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34667,8 +34664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-4832",
-   "self_type" : "type-4831",
+   "referenced_type" : "type-5188",
+   "self_type" : "type-5187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34677,38 +34674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-4976",
-   "self_type" : "type-4975",
-   "size" : 184,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-5153",
-   "self_type" : "type-5152",
-   "size" : 184,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-5344",
-   "self_type" : "type-5343",
-   "size" : 184,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-5521",
-   "self_type" : "type-5520",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34727,8 +34694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5623",
+   "self_type" : "type-5622",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34737,8 +34704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34747,8 +34714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-6284",
-   "self_type" : "type-6283",
+   "referenced_type" : "type-5924",
+   "self_type" : "type-5923",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34757,8 +34724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-6416",
-   "self_type" : "type-6415",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34767,8 +34734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34777,8 +34744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6354",
+   "self_type" : "type-6353",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34787,8 +34754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-7150",
-   "self_type" : "type-7149",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34797,8 +34764,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-7355",
-   "self_type" : "type-7354",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34807,8 +34774,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-7500",
-   "self_type" : "type-7499",
+   "referenced_type" : "type-7250",
+   "self_type" : "type-7249",
+   "size" : 184,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
+   "size" : 184,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "referenced_type" : "type-7548",
+   "self_type" : "type-7547",
+   "size" : 184,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34847,8 +34844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34857,8 +34854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3553",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34867,8 +34864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34877,8 +34874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2754",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3854",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34887,8 +34884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34897,8 +34894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34907,8 +34904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4789",
+   "self_type" : "type-4788",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34917,8 +34914,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4837",
+   "referenced_type" : "type-5194",
+   "self_type" : "type-5193",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34927,38 +34924,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-4983",
-   "self_type" : "type-4982",
-   "size" : 40,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-5160",
-   "self_type" : "type-5159",
-   "size" : 40,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-5350",
-   "self_type" : "type-5349",
-   "size" : 40,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5526",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34977,8 +34944,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34987,8 +34954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-5828",
-   "self_type" : "type-5827",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34997,8 +34964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-6290",
-   "self_type" : "type-6289",
+   "referenced_type" : "type-5930",
+   "self_type" : "type-5929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35007,8 +34974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-6422",
-   "self_type" : "type-6421",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35017,8 +34984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-6577",
-   "self_type" : "type-6576",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35027,8 +34994,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-6685",
-   "self_type" : "type-6684",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35037,8 +35004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-7156",
-   "self_type" : "type-7155",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35047,8 +35014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35057,8 +35024,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-7506",
-   "self_type" : "type-7505",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
+   "size" : 40,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "referenced_type" : "type-7395",
+   "self_type" : "type-7394",
+   "size" : 40,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "referenced_type" : "type-7554",
+   "self_type" : "type-7553",
+   "size" : 40,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35097,8 +35094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35107,8 +35104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-3556",
+   "self_type" : "type-3555",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35117,8 +35114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35127,8 +35124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2757",
-   "self_type" : "type-2756",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3856",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35137,8 +35134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35147,8 +35144,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3958",
-   "self_type" : "type-3957",
+   "referenced_type" : "type-4618",
+   "self_type" : "type-4617",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35157,8 +35154,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-4129",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4791",
+   "self_type" : "type-4790",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35167,8 +35164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-4840",
-   "self_type" : "type-4839",
+   "referenced_type" : "type-5196",
+   "self_type" : "type-5195",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35177,38 +35174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-4985",
-   "self_type" : "type-4984",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-5162",
-   "self_type" : "type-5161",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-5353",
-   "self_type" : "type-5352",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-5529",
-   "self_type" : "type-5528",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35227,8 +35194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-5706",
-   "self_type" : "type-5705",
+   "referenced_type" : "type-5631",
+   "self_type" : "type-5630",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35237,8 +35204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-5830",
-   "self_type" : "type-5829",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35247,8 +35214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35257,8 +35224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-6424",
-   "self_type" : "type-6423",
+   "referenced_type" : "type-6085",
+   "self_type" : "type-6084",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35267,8 +35234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35277,8 +35244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-6687",
-   "self_type" : "type-6686",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35287,8 +35254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-7158",
-   "self_type" : "type-7157",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35297,8 +35264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35307,8 +35274,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-7508",
-   "self_type" : "type-7507",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7396",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7555",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35347,8 +35344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35357,8 +35354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35367,8 +35364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2628",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35377,8 +35374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2753",
-   "self_type" : "type-2752",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35387,8 +35384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35397,8 +35394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3954",
-   "self_type" : "type-3953",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35407,8 +35404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4787",
+   "self_type" : "type-4786",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35417,8 +35414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-4836",
-   "self_type" : "type-4835",
+   "referenced_type" : "type-5192",
+   "self_type" : "type-5191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35427,38 +35424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-4980",
-   "self_type" : "type-4979",
-   "size" : 228,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-5157",
-   "self_type" : "type-5156",
-   "size" : 228,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-5348",
-   "self_type" : "type-5347",
-   "size" : 228,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-5525",
-   "self_type" : "type-5524",
+   "referenced_type" : "type-5450",
+   "self_type" : "type-5449",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35477,8 +35444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-5701",
-   "self_type" : "type-5700",
+   "referenced_type" : "type-5627",
+   "self_type" : "type-5626",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35487,8 +35454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-5826",
-   "self_type" : "type-5825",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35497,8 +35464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-6288",
-   "self_type" : "type-6287",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35507,8 +35474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-6420",
-   "self_type" : "type-6419",
+   "referenced_type" : "type-6081",
+   "self_type" : "type-6080",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35517,8 +35484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-6575",
-   "self_type" : "type-6574",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35527,8 +35494,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-6683",
-   "self_type" : "type-6682",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35537,8 +35504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-7154",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35547,8 +35514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-7359",
-   "self_type" : "type-7358",
+   "referenced_type" : "type-7008",
+   "self_type" : "type-7007",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35557,8 +35524,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-7504",
-   "self_type" : "type-7503",
+   "referenced_type" : "type-7254",
+   "self_type" : "type-7253",
+   "size" : 228,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-7393",
+   "self_type" : "type-7392",
+   "size" : 228,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-7552",
+   "self_type" : "type-7551",
+   "size" : 228,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35597,8 +35594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35607,8 +35604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3557",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35617,8 +35614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2635",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35627,8 +35624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2759",
-   "self_type" : "type-2758",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35637,8 +35634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3753",
-   "self_type" : "type-3752",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35647,8 +35644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3960",
-   "self_type" : "type-3959",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35657,8 +35654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-4131",
-   "self_type" : "type-4130",
+   "referenced_type" : "type-4793",
+   "self_type" : "type-4792",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35667,8 +35664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35677,8 +35674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-4987",
-   "self_type" : "type-4986",
+   "referenced_type" : "type-5458",
+   "self_type" : "type-5457",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35687,8 +35684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-5164",
-   "self_type" : "type-5163",
+   "referenced_type" : "type-5633",
+   "self_type" : "type-5632",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35697,38 +35694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-5356",
-   "self_type" : "type-5355",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-5531",
-   "self_type" : "type-5530",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5707",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35747,8 +35714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-5934",
+   "self_type" : "type-5933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35757,8 +35724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6086",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35767,8 +35734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-6582",
-   "self_type" : "type-6581",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35777,8 +35744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-6689",
-   "self_type" : "type-6688",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35787,8 +35754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-7160",
-   "self_type" : "type-7159",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35797,8 +35764,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-7365",
-   "self_type" : "type-7364",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35807,8 +35774,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-7510",
-   "self_type" : "type-7509",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-7399",
+   "self_type" : "type-7398",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-7558",
+   "self_type" : "type-7557",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-7703",
+   "self_type" : "type-7702",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35847,8 +35844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35857,8 +35854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35867,8 +35864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35877,8 +35874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35887,8 +35884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-4400",
+   "self_type" : "type-4399",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35897,8 +35894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3948",
-   "self_type" : "type-3947",
+   "referenced_type" : "type-4608",
+   "self_type" : "type-4607",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35907,8 +35904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-4118",
-   "self_type" : "type-4117",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35917,8 +35914,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-4830",
-   "self_type" : "type-4829",
+   "referenced_type" : "type-5185",
+   "self_type" : "type-5184",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35927,38 +35924,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-4974",
-   "self_type" : "type-4973",
-   "size" : 80,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-5151",
-   "self_type" : "type-5150",
-   "size" : 80,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-5342",
-   "self_type" : "type-5341",
-   "size" : 80,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-5519",
-   "self_type" : "type-5518",
+   "referenced_type" : "type-5444",
+   "self_type" : "type-5443",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35977,8 +35944,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5621",
+   "self_type" : "type-5620",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35987,8 +35954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35997,8 +35964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-6282",
-   "self_type" : "type-6281",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36007,8 +35974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-6413",
-   "self_type" : "type-6412",
+   "referenced_type" : "type-6075",
+   "self_type" : "type-6074",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36017,8 +35984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6207",
+   "self_type" : "type-6206",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36027,8 +35994,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-6677",
-   "self_type" : "type-6676",
+   "referenced_type" : "type-6352",
+   "self_type" : "type-6351",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36037,8 +36004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-7148",
-   "self_type" : "type-7147",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36047,8 +36014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-7353",
-   "self_type" : "type-7352",
+   "referenced_type" : "type-7002",
+   "self_type" : "type-7001",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36057,8 +36024,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-7498",
-   "self_type" : "type-7497",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
+   "size" : 80,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
+   "size" : 80,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
+   "size" : 80,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-7689",
+   "self_type" : "type-7688",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36097,8 +36094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36107,8 +36104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3549",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36117,8 +36114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2626",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36127,8 +36124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2750",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36137,8 +36134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36147,8 +36144,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3951",
+   "referenced_type" : "type-4612",
+   "self_type" : "type-4611",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36157,8 +36154,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-4122",
-   "self_type" : "type-4121",
+   "referenced_type" : "type-4784",
+   "self_type" : "type-4783",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36167,8 +36164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-4834",
-   "self_type" : "type-4833",
+   "referenced_type" : "type-5190",
+   "self_type" : "type-5189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36177,38 +36174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-4978",
-   "self_type" : "type-4977",
-   "size" : 20,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-5155",
-   "self_type" : "type-5154",
-   "size" : 20,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-5346",
-   "self_type" : "type-5345",
-   "size" : 20,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-5523",
-   "self_type" : "type-5522",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5447",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36227,8 +36194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-5699",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5625",
+   "self_type" : "type-5624",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36237,8 +36204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-5824",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5801",
+   "self_type" : "type-5800",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36247,8 +36214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-6286",
-   "self_type" : "type-6285",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5925",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36257,8 +36224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-6418",
-   "self_type" : "type-6417",
+   "referenced_type" : "type-6079",
+   "self_type" : "type-6078",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36267,8 +36234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-6573",
-   "self_type" : "type-6572",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36277,8 +36244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-6681",
-   "self_type" : "type-6680",
+   "referenced_type" : "type-6357",
+   "self_type" : "type-6356",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36287,8 +36254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-6446",
+   "self_type" : "type-6445",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36297,8 +36264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7356",
+   "referenced_type" : "type-7006",
+   "self_type" : "type-7005",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36307,8 +36274,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
+   "size" : 20,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
+   "size" : 20,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-7550",
+   "self_type" : "type-7549",
+   "size" : 20,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36347,8 +36344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-3414",
+   "self_type" : "type-3413",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36357,8 +36354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36367,8 +36364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2638",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36377,8 +36374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36387,8 +36384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3771",
-   "self_type" : "type-3770",
+   "referenced_type" : "type-4430",
+   "self_type" : "type-4429",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36397,8 +36394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3977",
-   "self_type" : "type-3976",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36407,8 +36404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-4145",
-   "self_type" : "type-4144",
+   "referenced_type" : "type-4807",
+   "self_type" : "type-4806",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36417,8 +36414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-4846",
-   "self_type" : "type-4845",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36427,8 +36424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-4992",
-   "self_type" : "type-4991",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36437,8 +36434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-5181",
-   "self_type" : "type-5180",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36447,8 +36444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-5387",
-   "self_type" : "type-5386",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36457,8 +36454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36467,8 +36464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36477,8 +36474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-5851",
-   "self_type" : "type-5850",
+   "referenced_type" : "type-6236",
+   "self_type" : "type-6235",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36487,8 +36484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6309",
-   "self_type" : "type-6308",
+   "referenced_type" : "type-6369",
+   "self_type" : "type-6368",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36507,8 +36504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36517,8 +36514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6586",
-   "self_type" : "type-6585",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36527,8 +36524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6707",
-   "self_type" : "type-6706",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36537,8 +36534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-7182",
-   "self_type" : "type-7181",
+   "referenced_type" : "type-7413",
+   "self_type" : "type-7412",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36547,8 +36544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7562",
+   "self_type" : "type-7561",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36557,8 +36554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7525",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36597,8 +36594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36607,8 +36604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36617,8 +36614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2643",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36627,8 +36624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36637,8 +36634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36647,8 +36644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3981",
-   "self_type" : "type-3980",
+   "referenced_type" : "type-4641",
+   "self_type" : "type-4640",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36657,8 +36654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-4150",
-   "self_type" : "type-4149",
+   "referenced_type" : "type-4812",
+   "self_type" : "type-4811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36667,8 +36664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-4850",
-   "self_type" : "type-4849",
+   "referenced_type" : "type-5219",
+   "self_type" : "type-5218",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36677,8 +36674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-4996",
-   "self_type" : "type-4995",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36687,8 +36684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-5185",
-   "self_type" : "type-5184",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5653",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36697,8 +36694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-5391",
-   "self_type" : "type-5390",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36707,8 +36704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36717,8 +36714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-6108",
+   "self_type" : "type-6107",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36727,8 +36724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-5855",
-   "self_type" : "type-5854",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36737,18 +36734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6313",
-   "self_type" : "type-6312",
-   "size" : 52,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6446",
-   "self_type" : "type-6445",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36767,8 +36754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6590",
-   "self_type" : "type-6589",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36777,8 +36764,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6711",
-   "self_type" : "type-6710",
+   "referenced_type" : "type-7040",
+   "self_type" : "type-7039",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36787,8 +36774,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-7187",
-   "self_type" : "type-7186",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36797,8 +36784,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7417",
+   "self_type" : "type-7416",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36807,8 +36794,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-7530",
-   "self_type" : "type-7529",
+   "referenced_type" : "type-7566",
+   "self_type" : "type-7565",
+   "size" : 52,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-7711",
+   "self_type" : "type-7710",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36847,8 +36844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3415",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36857,8 +36854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3576",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36867,8 +36864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36877,8 +36874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36887,8 +36884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
+   "referenced_type" : "type-4433",
+   "self_type" : "type-4432",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36897,8 +36894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3979",
-   "self_type" : "type-3978",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36907,8 +36904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-4148",
-   "self_type" : "type-4147",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36917,8 +36914,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-4848",
-   "self_type" : "type-4847",
+   "referenced_type" : "type-5217",
+   "self_type" : "type-5216",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36927,8 +36924,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-4994",
-   "self_type" : "type-4993",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36937,8 +36934,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-5183",
-   "self_type" : "type-5182",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36947,8 +36944,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-5389",
-   "self_type" : "type-5388",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36957,8 +36954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-5550",
-   "self_type" : "type-5549",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36967,8 +36964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-5714",
-   "self_type" : "type-5713",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36977,8 +36974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36987,8 +36984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-6311",
-   "self_type" : "type-6310",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6370",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37007,8 +37004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-6444",
-   "self_type" : "type-6443",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37017,8 +37014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-6588",
-   "self_type" : "type-6587",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7037",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37027,8 +37024,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-7283",
+   "self_type" : "type-7282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37037,8 +37034,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-7185",
-   "self_type" : "type-7184",
+   "referenced_type" : "type-7415",
+   "self_type" : "type-7414",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37047,8 +37044,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7563",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37057,8 +37054,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-7528",
-   "self_type" : "type-7527",
+   "referenced_type" : "type-7709",
+   "self_type" : "type-7708",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37097,8 +37094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37107,8 +37104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37117,8 +37114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2637",
-   "self_type" : "type-2636",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37127,8 +37124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37137,8 +37134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3769",
-   "self_type" : "type-3768",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4427",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37147,8 +37144,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3975",
-   "self_type" : "type-3974",
+   "referenced_type" : "type-4635",
+   "self_type" : "type-4634",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37157,8 +37154,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-4143",
-   "self_type" : "type-4142",
+   "referenced_type" : "type-4805",
+   "self_type" : "type-4804",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37167,8 +37164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-4844",
-   "self_type" : "type-4843",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37177,8 +37174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-4990",
-   "self_type" : "type-4989",
+   "referenced_type" : "type-5487",
+   "self_type" : "type-5486",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37187,8 +37184,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-5179",
-   "self_type" : "type-5178",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37197,8 +37194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-5385",
-   "self_type" : "type-5384",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37207,8 +37204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-5546",
-   "self_type" : "type-5545",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37217,8 +37214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-5710",
-   "self_type" : "type-5709",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37227,8 +37224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37237,8 +37234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6306",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37257,8 +37254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-6440",
-   "self_type" : "type-6439",
+   "referenced_type" : "type-6470",
+   "self_type" : "type-6469",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37267,8 +37264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-7032",
+   "self_type" : "type-7031",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37277,8 +37274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-6705",
-   "self_type" : "type-6704",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37287,8 +37284,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-7180",
-   "self_type" : "type-7179",
+   "referenced_type" : "type-7411",
+   "self_type" : "type-7410",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37297,8 +37294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-7381",
-   "self_type" : "type-7380",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37307,8 +37304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-7524",
-   "self_type" : "type-7523",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37347,8 +37344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37357,8 +37354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37367,8 +37364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2644",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37377,8 +37374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37387,8 +37384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37397,8 +37394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3983",
-   "self_type" : "type-3982",
+   "referenced_type" : "type-4643",
+   "self_type" : "type-4642",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37407,8 +37404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-4152",
-   "self_type" : "type-4151",
+   "referenced_type" : "type-4814",
+   "self_type" : "type-4813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37417,8 +37414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-4852",
-   "self_type" : "type-4851",
+   "referenced_type" : "type-5221",
+   "self_type" : "type-5220",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37427,8 +37424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-4998",
-   "self_type" : "type-4997",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37437,8 +37434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-5188",
-   "self_type" : "type-5187",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37447,8 +37444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-5394",
-   "self_type" : "type-5393",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37457,8 +37454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37467,8 +37464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-5718",
-   "self_type" : "type-5717",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37477,8 +37474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-5859",
-   "self_type" : "type-5858",
+   "referenced_type" : "type-6242",
+   "self_type" : "type-6241",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37487,8 +37484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6315",
-   "self_type" : "type-6314",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6374",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37497,8 +37494,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6480",
+   "self_type" : "type-6479",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37517,8 +37514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6592",
-   "self_type" : "type-6591",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37527,8 +37524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37537,8 +37534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-7190",
-   "self_type" : "type-7189",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37547,8 +37544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-7389",
-   "self_type" : "type-7388",
+   "referenced_type" : "type-7568",
+   "self_type" : "type-7567",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37557,8 +37554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-7532",
-   "self_type" : "type-7531",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37597,8 +37594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3433",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37607,8 +37604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2490",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37617,8 +37614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2654",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37627,8 +37624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2796",
-   "self_type" : "type-2795",
+   "referenced_type" : "type-3896",
+   "self_type" : "type-3895",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37637,8 +37634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-4446",
+   "self_type" : "type-4445",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37647,8 +37644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3990",
+   "referenced_type" : "type-4651",
+   "self_type" : "type-4650",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37657,8 +37654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-4160",
-   "self_type" : "type-4159",
+   "referenced_type" : "type-4822",
+   "self_type" : "type-4821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37667,8 +37664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-5069",
+   "self_type" : "type-5068",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37677,8 +37674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5006",
-   "self_type" : "type-5005",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37687,8 +37684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5199",
-   "self_type" : "type-5198",
+   "referenced_type" : "type-5509",
+   "self_type" : "type-5508",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37697,8 +37694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5407",
-   "self_type" : "type-5406",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37707,8 +37704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5564",
-   "self_type" : "type-5563",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37717,8 +37714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5728",
-   "self_type" : "type-5727",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37727,8 +37724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-5869",
-   "self_type" : "type-5868",
+   "referenced_type" : "type-6118",
+   "self_type" : "type-6117",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37737,8 +37734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-6323",
-   "self_type" : "type-6322",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37747,8 +37744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-6458",
-   "self_type" : "type-6457",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37757,8 +37754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-6604",
-   "self_type" : "type-6603",
+   "referenced_type" : "type-6490",
+   "self_type" : "type-6489",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37777,8 +37774,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-6725",
-   "self_type" : "type-6724",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37787,8 +37784,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-7198",
-   "self_type" : "type-7197",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37797,8 +37794,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-7400",
-   "self_type" : "type-7399",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37807,8 +37804,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-7542",
-   "self_type" : "type-7541",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7575",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37847,8 +37844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3431",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37857,8 +37854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37867,8 +37864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37877,8 +37874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37887,8 +37884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3785",
-   "self_type" : "type-3784",
+   "referenced_type" : "type-4444",
+   "self_type" : "type-4443",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37897,8 +37894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3989",
-   "self_type" : "type-3988",
+   "referenced_type" : "type-4649",
+   "self_type" : "type-4648",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37907,8 +37904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-4158",
-   "self_type" : "type-4157",
+   "referenced_type" : "type-4820",
+   "self_type" : "type-4819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37917,8 +37914,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-5066",
+   "self_type" : "type-5065",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37927,8 +37924,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5004",
-   "self_type" : "type-5003",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5226",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37937,8 +37934,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5195",
-   "self_type" : "type-5194",
+   "referenced_type" : "type-5507",
+   "self_type" : "type-5506",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37947,8 +37944,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5405",
-   "self_type" : "type-5404",
+   "referenced_type" : "type-5664",
+   "self_type" : "type-5663",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37957,8 +37954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5562",
-   "self_type" : "type-5561",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37967,8 +37964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5726",
-   "self_type" : "type-5725",
+   "referenced_type" : "type-5969",
+   "self_type" : "type-5968",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37977,8 +37974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-6116",
+   "self_type" : "type-6115",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37987,8 +37984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-6321",
-   "self_type" : "type-6320",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6249",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37997,8 +37994,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6383",
+   "self_type" : "type-6382",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38007,8 +38004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-6602",
-   "self_type" : "type-6601",
+   "referenced_type" : "type-6488",
+   "self_type" : "type-6487",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38027,8 +38024,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-6723",
-   "self_type" : "type-6722",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38037,8 +38034,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-7196",
-   "self_type" : "type-7195",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38047,8 +38044,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-7396",
-   "self_type" : "type-7395",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38057,8 +38054,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-7539",
-   "self_type" : "type-7538",
+   "referenced_type" : "type-7574",
+   "self_type" : "type-7573",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38097,8 +38094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-3430",
+   "self_type" : "type-3429",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38107,8 +38104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38117,8 +38114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38127,8 +38124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38137,8 +38134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3782",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4441",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38147,8 +38144,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3987",
-   "self_type" : "type-3986",
+   "referenced_type" : "type-4647",
+   "self_type" : "type-4646",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38157,8 +38154,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-4156",
-   "self_type" : "type-4155",
+   "referenced_type" : "type-4818",
+   "self_type" : "type-4817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38167,8 +38164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-4856",
-   "self_type" : "type-4855",
+   "referenced_type" : "type-5064",
+   "self_type" : "type-5063",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38177,8 +38174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5002",
-   "self_type" : "type-5001",
+   "referenced_type" : "type-5225",
+   "self_type" : "type-5224",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38187,8 +38184,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5193",
-   "self_type" : "type-5192",
+   "referenced_type" : "type-5505",
+   "self_type" : "type-5504",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38197,8 +38194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5403",
-   "self_type" : "type-5402",
+   "referenced_type" : "type-5662",
+   "self_type" : "type-5661",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38207,8 +38204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5560",
-   "self_type" : "type-5559",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38217,8 +38214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5724",
-   "self_type" : "type-5723",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38227,8 +38224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-5865",
-   "self_type" : "type-5864",
+   "referenced_type" : "type-6114",
+   "self_type" : "type-6113",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38237,8 +38234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6318",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38247,8 +38244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38257,8 +38254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-6599",
-   "self_type" : "type-6598",
+   "referenced_type" : "type-6486",
+   "self_type" : "type-6485",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38277,8 +38274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-6721",
-   "self_type" : "type-6720",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38287,8 +38284,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-7194",
-   "self_type" : "type-7193",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38297,8 +38294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7423",
+   "self_type" : "type-7422",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38307,8 +38304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-7537",
-   "self_type" : "type-7536",
+   "referenced_type" : "type-7572",
+   "self_type" : "type-7571",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38347,8 +38344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3427",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38357,8 +38354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2484",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38367,8 +38364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38377,8 +38374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38387,8 +38384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-4440",
+   "self_type" : "type-4439",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38397,8 +38394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3985",
-   "self_type" : "type-3984",
+   "referenced_type" : "type-4645",
+   "self_type" : "type-4644",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38407,8 +38404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-4154",
-   "self_type" : "type-4153",
+   "referenced_type" : "type-4816",
+   "self_type" : "type-4815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38417,8 +38414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-4854",
-   "self_type" : "type-4853",
+   "referenced_type" : "type-5062",
+   "self_type" : "type-5061",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38427,8 +38424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5000",
-   "self_type" : "type-4999",
+   "referenced_type" : "type-5223",
+   "self_type" : "type-5222",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38437,8 +38434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5190",
-   "self_type" : "type-5189",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38447,8 +38444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5401",
-   "self_type" : "type-5400",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38457,8 +38454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5558",
-   "self_type" : "type-5557",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38467,8 +38464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5722",
-   "self_type" : "type-5721",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38477,8 +38474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-5863",
-   "self_type" : "type-5862",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38487,8 +38484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-6317",
-   "self_type" : "type-6316",
+   "referenced_type" : "type-6246",
+   "self_type" : "type-6245",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38497,8 +38494,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38507,8 +38504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-6597",
-   "self_type" : "type-6596",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38527,8 +38524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-6719",
-   "self_type" : "type-6718",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7045",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38537,8 +38534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38547,8 +38544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-7392",
-   "self_type" : "type-7391",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7420",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38557,8 +38554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-7535",
-   "self_type" : "type-7534",
+   "referenced_type" : "type-7570",
+   "self_type" : "type-7569",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38597,8 +38594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-3436",
+   "self_type" : "type-3435",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38607,8 +38604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3592",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38617,8 +38614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38627,8 +38624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38637,8 +38634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3789",
-   "self_type" : "type-3788",
+   "referenced_type" : "type-4448",
+   "self_type" : "type-4447",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38647,8 +38644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3993",
-   "self_type" : "type-3992",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38657,8 +38654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "referenced_type" : "type-4824",
+   "self_type" : "type-4823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38667,8 +38664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4862",
+   "referenced_type" : "type-5071",
+   "self_type" : "type-5070",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38677,8 +38674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5008",
-   "self_type" : "type-5007",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38687,8 +38684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5201",
-   "self_type" : "type-5200",
+   "referenced_type" : "type-5511",
+   "self_type" : "type-5510",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38697,8 +38694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5409",
-   "self_type" : "type-5408",
+   "referenced_type" : "type-5668",
+   "self_type" : "type-5667",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38707,8 +38704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38717,8 +38714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5730",
-   "self_type" : "type-5729",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38727,8 +38724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38737,8 +38734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-6325",
-   "self_type" : "type-6324",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38747,8 +38744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38757,8 +38754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-6606",
-   "self_type" : "type-6605",
+   "referenced_type" : "type-6492",
+   "self_type" : "type-6491",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38777,8 +38774,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-6727",
-   "self_type" : "type-6726",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38787,8 +38784,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-7200",
-   "self_type" : "type-7199",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38797,8 +38794,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-7402",
-   "self_type" : "type-7401",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38807,8 +38804,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-7544",
-   "self_type" : "type-7543",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7577",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38857,8 +38854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-3356",
+   "self_type" : "type-3355",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38867,8 +38864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38877,8 +38874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38887,8 +38884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2617",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38897,8 +38894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38907,8 +38904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3737",
-   "self_type" : "type-3736",
+   "referenced_type" : "type-4396",
+   "self_type" : "type-4395",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38917,8 +38914,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38927,8 +38924,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38937,8 +38934,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3946",
-   "self_type" : "type-3945",
+   "referenced_type" : "type-4606",
+   "self_type" : "type-4605",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38947,8 +38944,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-4114",
-   "self_type" : "type-4113",
+   "referenced_type" : "type-4776",
+   "self_type" : "type-4775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38957,8 +38954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-4192",
-   "self_type" : "type-4191",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38967,8 +38964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-4784",
-   "self_type" : "type-4783",
+   "referenced_type" : "type-5073",
+   "self_type" : "type-5072",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38977,8 +38974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-4865",
-   "self_type" : "type-4864",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38987,38 +38984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-4908",
-   "self_type" : "type-4907",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5010",
-   "self_type" : "type-5009",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5079",
-   "self_type" : "type-5078",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5147",
-   "self_type" : "type-5146",
+   "referenced_type" : "type-5183",
+   "self_type" : "type-5182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39037,8 +39004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5329",
-   "self_type" : "type-5328",
+   "referenced_type" : "type-5431",
+   "self_type" : "type-5430",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39047,8 +39014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5517",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39057,8 +39024,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5626",
-   "self_type" : "type-5625",
+   "referenced_type" : "type-5728",
+   "self_type" : "type-5727",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39067,8 +39034,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5690",
-   "self_type" : "type-5689",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39077,8 +39044,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5814",
-   "self_type" : "type-5813",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39087,8 +39054,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-6280",
-   "self_type" : "type-6279",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39097,8 +39064,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39107,8 +39074,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-6507",
-   "self_type" : "type-6506",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6300",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39117,8 +39084,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39127,8 +39094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-6675",
-   "self_type" : "type-6674",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39137,8 +39104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7143",
-   "self_type" : "type-7142",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6995",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39147,8 +39114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7249",
-   "self_type" : "type-7248",
+   "referenced_type" : "type-7115",
+   "self_type" : "type-7114",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39157,8 +39124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7282",
-   "self_type" : "type-7281",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39167,8 +39134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7351",
-   "self_type" : "type-7350",
+   "referenced_type" : "type-7246",
+   "self_type" : "type-7245",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39177,8 +39144,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7495",
-   "self_type" : "type-7494",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39187,8 +39154,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7576",
-   "self_type" : "type-7575",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7580",
+   "self_type" : "type-7579",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7621",
+   "self_type" : "type-7620",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39207,8 +39204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-4103",
-   "self_type" : "type-4102",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39217,8 +39214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-4205",
-   "self_type" : "type-4204",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39227,8 +39224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-4884",
-   "self_type" : "type-4883",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5085",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39237,8 +39234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-5021",
-   "self_type" : "type-5020",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5138",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39247,8 +39244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-5099",
-   "self_type" : "type-5098",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39257,8 +39254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-7485",
-   "self_type" : "type-7484",
+   "referenced_type" : "type-7469",
+   "self_type" : "type-7468",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39267,8 +39264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-7594",
-   "self_type" : "type-7593",
+   "referenced_type" : "type-7597",
+   "self_type" : "type-7596",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39277,8 +39274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39287,8 +39284,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-4327",
-   "self_type" : "type-4326",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39297,8 +39294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-6247",
-   "self_type" : "type-6246",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39307,8 +39304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-7413",
-   "self_type" : "type-7412",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39317,8 +39314,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39327,8 +39324,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-4323",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4986",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39337,8 +39334,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6243",
+   "referenced_type" : "type-6033",
+   "self_type" : "type-6032",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39347,8 +39344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-7398",
-   "self_type" : "type-7397",
+   "referenced_type" : "type-7513",
+   "self_type" : "type-7512",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39357,8 +39354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4096",
-   "self_type" : "type-4095",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4755",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39367,8 +39364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4201",
-   "self_type" : "type-4200",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4862",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39377,8 +39374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4875",
-   "self_type" : "type-4874",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39387,8 +39384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-5012",
-   "self_type" : "type-5011",
+   "referenced_type" : "type-5135",
+   "self_type" : "type-5134",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39397,8 +39394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-5095",
-   "self_type" : "type-5094",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39407,8 +39404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-7478",
-   "self_type" : "type-7477",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7464",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39417,8 +39414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-7590",
-   "self_type" : "type-7589",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7587",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39427,8 +39424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-3076",
-   "self_type" : "type-3075",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39437,8 +39434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-6080",
-   "self_type" : "type-6079",
+   "referenced_type" : "type-4107",
+   "self_type" : "type-4106",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39447,8 +39444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-6898",
-   "self_type" : "type-6897",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39487,8 +39484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2173",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39497,8 +39494,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39507,8 +39504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39517,8 +39514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39527,58 +39524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2733",
-   "self_type" : "type-2732",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3697",
-   "self_type" : "type-3696",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3830",
-   "self_type" : "type-3829",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4003",
-   "self_type" : "type-4002",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39597,8 +39544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4355",
+   "self_type" : "type-4354",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39607,8 +39554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4793",
-   "self_type" : "type-4792",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39617,8 +39564,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39627,8 +39574,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4922",
-   "self_type" : "type-4921",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39637,8 +39584,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4933",
-   "self_type" : "type-4932",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39647,8 +39594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5105",
-   "self_type" : "type-5104",
+   "referenced_type" : "type-4871",
+   "self_type" : "type-4870",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39657,8 +39604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5138",
-   "self_type" : "type-5137",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39667,8 +39614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5246",
-   "self_type" : "type-5245",
+   "referenced_type" : "type-5172",
+   "self_type" : "type-5171",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39677,8 +39624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5511",
-   "self_type" : "type-5510",
+   "referenced_type" : "type-5348",
+   "self_type" : "type-5347",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39687,8 +39634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39697,8 +39644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5684",
-   "self_type" : "type-5683",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39707,8 +39654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39717,8 +39664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6271",
-   "self_type" : "type-6270",
+   "referenced_type" : "type-5908",
+   "self_type" : "type-5907",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39727,8 +39674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6404",
-   "self_type" : "type-6403",
+   "referenced_type" : "type-6063",
+   "self_type" : "type-6062",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39737,8 +39684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6502",
-   "self_type" : "type-6501",
+   "referenced_type" : "type-6200",
+   "self_type" : "type-6199",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39747,8 +39694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6556",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6296",
+   "self_type" : "type-6295",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39757,8 +39704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39767,8 +39714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7099",
-   "self_type" : "type-7098",
+   "referenced_type" : "type-6432",
+   "self_type" : "type-6431",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39777,8 +39724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7230",
-   "self_type" : "type-7229",
+   "referenced_type" : "type-6953",
+   "self_type" : "type-6952",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39787,8 +39734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7291",
-   "self_type" : "type-7290",
+   "referenced_type" : "type-7092",
+   "self_type" : "type-7091",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39797,8 +39744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7368",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39807,8 +39754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7410",
-   "self_type" : "type-7409",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39817,8 +39764,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7599",
-   "self_type" : "type-7598",
+   "referenced_type" : "type-7307",
+   "self_type" : "type-7306",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7474",
+   "self_type" : "type-7473",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7500",
+   "self_type" : "type-7499",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7505",
+   "self_type" : "type-7504",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7645",
+   "self_type" : "type-7644",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39837,8 +39834,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-3721",
-   "self_type" : "type-3720",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4379",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39847,8 +39844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-3848",
-   "self_type" : "type-3847",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39857,8 +39854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-6977",
+   "self_type" : "type-6976",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39867,8 +39864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-7246",
-   "self_type" : "type-7245",
+   "referenced_type" : "type-7111",
+   "self_type" : "type-7110",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39918,7 +39915,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-500",
-   "self_type" : "type-1794",
+   "self_type" : "type-2521",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39964,7 +39961,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -39979,8 +39976,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -39996,7 +39993,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40016,8 +40013,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -40033,7 +40030,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40058,8 +40055,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40075,7 +40072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40095,7 +40092,7 @@
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "bIsMIDI",
@@ -40105,8 +40102,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40122,7 +40119,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40137,12 +40134,12 @@
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40152,13 +40149,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40174,7 +40171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40184,13 +40181,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-2198"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -40206,7 +40203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40221,23 +40218,23 @@
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40253,7 +40250,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40268,8 +40265,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40285,7 +40282,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40295,17 +40292,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40355,8 +40352,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40372,7 +40369,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40387,13 +40384,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40409,7 +40406,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40429,13 +40426,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -40451,7 +40448,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40486,8 +40483,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40503,7 +40500,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40533,8 +40530,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40550,7 +40547,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40590,13 +40587,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-2171"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2172",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40612,7 +40609,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40627,8 +40624,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40644,7 +40641,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40659,8 +40656,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40676,7 +40673,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40691,42 +40688,42 @@
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDensity",
@@ -40741,13 +40738,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40763,7 +40760,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40778,7 +40775,7 @@
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-2194"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40788,8 +40785,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40805,7 +40802,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40825,8 +40822,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40842,7 +40839,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40857,13 +40854,13 @@
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40879,7 +40876,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40924,23 +40921,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1678"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40956,7 +40953,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40981,8 +40978,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40998,7 +40995,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41018,23 +41015,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1420"
+     "referenced_type" : "type-1903"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1418"
+     "referenced_type" : "type-1882"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41050,7 +41047,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41065,7 +41062,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
@@ -41100,8 +41097,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2057",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41117,7 +41114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41142,8 +41139,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41159,7 +41156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41179,7 +41176,7 @@
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1412"
+     "referenced_type" : "type-1810"
     },
     {
      "field_name" : "bHiPassFilter",
@@ -41194,8 +41191,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41211,7 +41208,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41226,13 +41223,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1833"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1843",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41248,7 +41245,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41268,13 +41265,13 @@
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1416"
+     "referenced_type" : "type-1855"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41290,7 +41287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41310,8 +41307,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1947",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -41327,7 +41324,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41347,8 +41344,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1925",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41364,7 +41361,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41384,8 +41381,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -41401,7 +41398,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41426,18 +41423,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-1440"
+     "referenced_type" : "type-2113"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-2124"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41453,7 +41450,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41468,7 +41465,7 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bLoadDefaultSound",
@@ -41478,13 +41475,13 @@
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1437"
+     "referenced_type" : "type-2090"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41500,7 +41497,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41530,18 +41527,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1663"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1398",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -41557,7 +41554,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41572,12 +41569,12 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1467"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1463"
     },
     {
      "field_name" : "bInterleaved",
@@ -41597,18 +41594,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1634"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1643"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1642",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -41624,7 +41621,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41649,8 +41646,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2002",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -41666,7 +41663,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41691,8 +41688,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1991",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -41708,7 +41705,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41733,8 +41730,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -41750,7 +41747,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41765,13 +41762,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -41787,7 +41784,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41802,7 +41799,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41817,8 +41814,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41834,7 +41831,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41854,7 +41851,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41869,8 +41866,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41886,7 +41883,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41931,13 +41928,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1407"
+     "referenced_type" : "type-1757"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41953,7 +41950,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41998,18 +41995,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1777"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -42025,7 +42022,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42040,7 +42037,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
@@ -42075,8 +42072,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2068",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -42092,7 +42089,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42117,8 +42114,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1980",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -42134,7 +42131,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42159,8 +42156,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1969",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42176,7 +42173,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42231,8 +42228,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42248,7 +42245,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42268,12 +42265,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1724"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1734"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42298,8 +42295,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1744",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42325,13 +42322,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 160,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1620",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42357,8 +42354,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42384,8 +42381,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42401,7 +42398,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pBuffer",
@@ -42481,8 +42478,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42493,23 +42490,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1592"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1594"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1591",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42525,13 +42522,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1505"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1504",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42547,7 +42544,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42562,98 +42559,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-2359"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-2367"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-2370"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-2373"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-1656"
+     "referenced_type" : "type-2385"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1505"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-2388"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-2390"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 168,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42669,7 +42666,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42689,8 +42686,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -42706,7 +42703,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnabled",
@@ -42716,8 +42713,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -42733,7 +42730,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42748,8 +42745,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -42765,7 +42762,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42790,8 +42787,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -42807,7 +42804,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42822,13 +42819,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -42844,7 +42841,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42854,7 +42851,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-2203"
     },
     {
      "field_name" : "xColorOffset",
@@ -42864,8 +42861,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42881,7 +42878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42906,8 +42903,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -42923,7 +42920,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42943,8 +42940,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -42960,7 +42957,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -42980,8 +42977,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42997,7 +42994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -43032,8 +43029,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43049,7 +43046,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43064,8 +43061,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -43081,7 +43078,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43091,13 +43088,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-1511"
+     "referenced_type" : "type-2240"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-1512",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43113,7 +43110,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43123,13 +43120,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1494"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -43145,7 +43142,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43155,7 +43152,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-1515"
+     "referenced_type" : "type-2244"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43195,8 +43192,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43212,7 +43209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43267,8 +43264,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43284,7 +43281,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43299,8 +43296,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -43316,7 +43313,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43331,8 +43328,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43348,7 +43345,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43363,8 +43360,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -43380,7 +43377,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43390,13 +43387,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-2207"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43412,7 +43409,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43427,8 +43424,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -43444,7 +43441,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43459,8 +43456,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -43476,7 +43473,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43491,13 +43488,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43513,7 +43510,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43528,8 +43525,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43545,12 +43542,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43565,8 +43562,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43582,12 +43579,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43602,12 +43599,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43617,12 +43614,12 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43642,13 +43639,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 192,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43664,7 +43661,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43674,13 +43671,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-1486"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -43696,7 +43693,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43716,8 +43713,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -43733,7 +43730,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43753,8 +43750,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43770,7 +43767,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43800,8 +43797,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43817,7 +43814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43832,8 +43829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -43849,7 +43846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43864,8 +43861,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2230",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43881,7 +43878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43901,8 +43898,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -43918,7 +43915,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43928,13 +43925,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-1506"
+     "referenced_type" : "type-2235"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -43950,7 +43947,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43960,13 +43957,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1492"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -43982,7 +43979,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44002,8 +43999,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -44019,7 +44016,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44029,7 +44026,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1576"
+     "referenced_type" : "type-2305"
     },
     {
      "field_name" : "nFocusSteps",
@@ -44044,8 +44041,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44061,7 +44058,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44071,13 +44068,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-2302"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -44093,7 +44090,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44103,23 +44100,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-1582"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-1584"
+     "referenced_type" : "type-2313"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44135,7 +44132,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44150,18 +44147,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -44177,7 +44174,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44192,8 +44189,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44209,7 +44206,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44219,18 +44216,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-2308"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-1581"
+     "referenced_type" : "type-2310"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44276,12 +44273,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44291,8 +44288,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44313,8 +44310,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44330,7 +44327,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnablePM",
@@ -44340,8 +44337,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44357,13 +44354,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44379,7 +44376,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44389,7 +44386,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1564"
     },
     {
      "field_name" : "nDataSize",
@@ -44399,13 +44396,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -44421,7 +44418,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44436,13 +44433,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -44453,13 +44450,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44475,7 +44472,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44485,13 +44482,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1610",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44507,18 +44504,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1527",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -44534,7 +44531,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "hPipe",
@@ -44544,8 +44541,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -44561,18 +44558,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2344",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -44588,7 +44585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44598,18 +44595,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-1508"
+     "referenced_type" : "type-2237"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44625,7 +44622,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44640,8 +44637,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -44657,7 +44654,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44667,7 +44664,7 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "bCenterStatus",
@@ -44717,8 +44714,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44734,7 +44731,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44754,8 +44751,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -44771,7 +44768,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44786,8 +44783,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -44803,7 +44800,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -44813,7 +44810,7 @@
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44823,7 +44820,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -44833,7 +44830,7 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "bEnabled",
@@ -44843,8 +44840,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44860,7 +44857,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44870,7 +44867,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1458"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44900,12 +44897,12 @@
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-2336"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -44920,8 +44917,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44932,27 +44929,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1620"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-2331"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5)"
@@ -44968,7 +44965,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44988,13 +44985,13 @@
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-1484"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -45010,18 +45007,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -45037,18 +45034,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-2340"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -45064,7 +45061,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45079,8 +45076,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45096,7 +45093,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPorts",
@@ -45111,8 +45108,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45128,7 +45125,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45143,8 +45140,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -45160,7 +45157,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
@@ -45170,8 +45167,8 @@
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45187,18 +45184,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45214,12 +45211,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-2323"
     },
     {
      "field_name" : "nStartTime",
@@ -45239,8 +45236,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45256,7 +45253,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45281,8 +45278,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -45298,7 +45295,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "xScale",
@@ -45308,8 +45305,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1597",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -45325,18 +45322,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45352,7 +45349,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45367,8 +45364,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45384,7 +45381,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45394,7 +45391,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-2320"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45419,13 +45416,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-2323"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45441,13 +45438,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1615",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45458,7 +45455,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nVersion",
@@ -45468,8 +45465,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -45501,8 +45498,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1481",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5)"
@@ -45518,7 +45515,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45538,8 +45535,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45555,7 +45552,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45570,8 +45567,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -45587,7 +45584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45602,8 +45599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45619,7 +45616,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45639,13 +45636,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-1566"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1567",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -45661,7 +45658,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45726,12 +45723,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-1552"
+     "referenced_type" : "type-2281"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-1554"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45786,13 +45783,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-1555"
+     "referenced_type" : "type-2284"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45808,7 +45805,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45818,17 +45815,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-1526"
+     "referenced_type" : "type-2255"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45850,8 +45847,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5)"
@@ -45867,7 +45864,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45902,8 +45899,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45919,7 +45916,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45939,12 +45936,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-1536"
+     "referenced_type" : "type-2265"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-1537"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
@@ -45974,8 +45971,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45991,7 +45988,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46001,7 +45998,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-1532"
+     "referenced_type" : "type-2261"
     },
     {
      "field_name" : "nAirMBs",
@@ -46021,8 +46018,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -46038,7 +46035,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46048,7 +46045,7 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-1530"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "bUnrestrictedMVs",
@@ -46073,8 +46070,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1531",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -46090,7 +46087,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46110,18 +46107,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-2270"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-1542"
+     "referenced_type" : "type-2271"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46137,7 +46134,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46192,12 +46189,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-1544"
+     "referenced_type" : "type-2273"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-1545"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46217,8 +46214,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46234,7 +46231,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46249,12 +46246,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1521"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xFramerate",
@@ -46264,8 +46261,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46281,7 +46278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46306,8 +46303,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46323,7 +46320,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46348,8 +46345,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46365,7 +46362,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46375,7 +46372,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-1549"
+     "referenced_type" : "type-2278"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46430,8 +46427,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46447,7 +46444,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46492,8 +46489,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46509,7 +46506,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46539,8 +46536,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46556,7 +46553,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46566,13 +46563,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-1547"
+     "referenced_type" : "type-2276"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46628,12 +46625,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1521"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46643,8 +46640,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46716,8 +46713,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47477,9 +47474,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48828,7 +48822,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2950"
+     "referenced_type" : "type-1496"
     },
     {
      "referenced_type" : "type-50"
@@ -48837,11 +48831,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2951" ],
+   "template_args" : [ "type-1497" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48875,9 +48869,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -49000,7 +48991,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3062"
+     "referenced_type" : "type-1626"
     },
     {
      "referenced_type" : "type-50"
@@ -49009,11 +49000,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1625",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3063" ],
+   "template_args" : [ "type-1627" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49205,7 +49196,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3663"
+     "referenced_type" : "type-4321"
     },
     {
      "referenced_type" : "type-50"
@@ -49214,11 +49205,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3662",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4320",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3664" ],
+   "template_args" : [ "type-4322" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49434,7 +49425,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3823"
+     "referenced_type" : "type-4483"
     },
     {
      "referenced_type" : "type-50"
@@ -49443,11 +49434,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4482",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3824" ],
+   "template_args" : [ "type-4484" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49711,28 +49702,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1703"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1704"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49751,8 +49742,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49845,7 +49836,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -49870,8 +49861,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49887,7 +49878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -49917,13 +49908,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49939,12 +49930,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49974,13 +49965,13 @@
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-1695"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49996,12 +49987,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
@@ -50031,13 +50022,13 @@
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -50053,7 +50044,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50073,13 +50064,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50095,7 +50086,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50105,13 +50096,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50127,7 +50118,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50142,8 +50133,8 @@
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50363,7 +50354,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50378,8 +50369,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50725,17 +50716,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-2438"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-2439"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50746,15 +50737,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-2440"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::HDRStaticInfo::(anonymous union at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5) at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5",
    "name" : "android::HDRStaticInfo::(anonymous union at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5) at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50775,8 +50766,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50787,22 +50778,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50827,8 +50818,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51287,17 +51278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-2810"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-2822",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-2823" ],
+   "template_args" : [ "type-1240", "type-1368" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51523,17 +51514,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-2355" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51944,7 +51935,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-2418"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51969,13 +51960,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-2419"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51986,7 +51977,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-1696"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -52016,13 +52007,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-1697"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52058,8 +52049,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52095,8 +52086,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52175,8 +52166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52388,17 +52379,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-2963"
+     "referenced_type" : "type-1513"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2968",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-2969" ],
+   "template_args" : [ "type-1518" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52437,17 +52428,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3079"
+     "referenced_type" : "type-1648"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
    "name" : "android::Parcel::FlattenableHelper<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3091" ],
+   "template_args" : [ "type-1660" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52486,17 +52477,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3667"
+     "referenced_type" : "type-4325"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3673",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4331",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3674" ],
+   "template_args" : [ "type-4332" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52535,17 +52526,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3078"
+     "referenced_type" : "type-1647"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3086" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52584,17 +52575,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3666"
+     "referenced_type" : "type-4324"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4336",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3679" ],
+   "template_args" : [ "type-4337" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52633,17 +52624,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3668"
+     "referenced_type" : "type-4326"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3683",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4341",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3684" ],
+   "template_args" : [ "type-4342" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52788,7 +52779,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -52813,8 +52804,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52830,7 +52821,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnable",
@@ -52840,8 +52831,8 @@
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -53187,8 +53178,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53222,8 +53213,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
    "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILm0EJRKNS_10BufferItemEEEE"
@@ -53241,8 +53232,8 @@
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3012",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53260,8 +53251,8 @@
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3016",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53270,8 +53261,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3020",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53280,8 +53271,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53290,52 +53281,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3005",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3006" ],
+   "template_args" : [ "type-1557" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<const BufferItem &> >",
-   "referenced_type" : "type-3007",
-   "self_type" : "type-3007",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3008" ],
+   "template_args" : [ "type-1559" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_10BufferItemEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<BufferItem>, tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<BufferItem>, tuple<> >",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1560",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3010" ],
+   "template_args" : [ "type-1561" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RemoveFirst<std::tuple<const BufferItem &>>",
    "name" : "android::SafeBnInterface<IConsumerListener>::RemoveFirst<std::tuple<const BufferItem &>>",
-   "referenced_type" : "type-3003",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3004" ],
+   "template_args" : [ "type-1555" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3415",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
@@ -53344,8 +53335,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-3430",
-   "self_type" : "type-3430",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
@@ -53354,8 +53345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-3435",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53364,8 +53355,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
-   "referenced_type" : "type-3432",
-   "self_type" : "type-3432",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
@@ -53374,8 +53365,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3437",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
@@ -53384,8 +53375,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
-   "referenced_type" : "type-3429",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EEEE"
@@ -53394,8 +53385,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-3424",
-   "self_type" : "type-3424",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53404,8 +53395,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53414,8 +53405,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3421",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53424,8 +53415,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
-   "referenced_type" : "type-3418",
-   "self_type" : "type-3418",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
@@ -53434,8 +53425,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
-   "referenced_type" : "type-3434",
-   "self_type" : "type-3434",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53444,8 +53435,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-3427",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
@@ -53454,8 +53445,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
-   "referenced_type" : "type-3433",
-   "self_type" : "type-3433",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
@@ -53464,8 +53455,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
-   "referenced_type" : "type-3426",
-   "self_type" : "type-3426",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
@@ -53474,8 +53465,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
-   "referenced_type" : "type-3431",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
@@ -53484,8 +53475,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3416",
-   "self_type" : "type-3416",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
@@ -53494,8 +53485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-3436",
-   "self_type" : "type-3436",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53504,8 +53495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-3438",
-   "self_type" : "type-3438",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
@@ -53514,8 +53505,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-3425",
-   "self_type" : "type-3425",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53524,8 +53515,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53534,8 +53525,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3422",
-   "self_type" : "type-3422",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53544,8 +53535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-3428",
-   "self_type" : "type-3428",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
@@ -53554,8 +53545,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3417",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
@@ -53564,8 +53555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3423",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53583,8 +53574,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2071",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53602,8 +53593,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3439",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53621,8 +53612,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3476",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2088",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53640,8 +53631,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53659,8 +53650,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3482",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53678,8 +53669,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53697,8 +53688,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3472",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53716,8 +53707,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2066",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53735,8 +53726,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3447",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2058",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53754,8 +53745,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3451",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53773,8 +53764,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3443",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53792,8 +53783,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53811,8 +53802,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2080",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53830,8 +53821,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53849,8 +53840,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2075",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPmEEEEEE"
@@ -53868,8 +53859,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3480",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJmEEEEEE"
@@ -53878,8 +53869,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3508",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53888,8 +53879,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3503",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53898,8 +53889,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3512",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53908,8 +53899,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3517",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53918,8 +53909,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3514",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53928,8 +53919,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3518",
-   "self_type" : "type-3518",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53938,8 +53929,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
-   "referenced_type" : "type-3511",
-   "self_type" : "type-3511",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53948,8 +53939,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53958,8 +53949,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3505",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53968,8 +53959,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53978,8 +53969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53988,8 +53979,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53998,8 +53989,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3510",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -54008,8 +53999,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -54018,8 +54009,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
-   "referenced_type" : "type-3509",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPmEEEEEE"
@@ -54028,8 +54019,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJmEEEEEE"
@@ -54046,8 +54037,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54064,8 +54055,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3519",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -54082,8 +54073,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3537",
-   "self_type" : "type-3537",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54100,8 +54091,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54118,8 +54109,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-3541",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54136,8 +54127,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54154,8 +54145,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3535",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54172,8 +54163,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54190,8 +54181,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54208,8 +54199,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54226,8 +54217,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3521",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54244,8 +54235,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3545",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54262,8 +54253,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3533",
-   "self_type" : "type-3533",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54280,8 +54271,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54298,8 +54289,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPmEEEEEE"
@@ -54316,8 +54307,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3539",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJmEEEEEE"
@@ -54326,660 +54317,660 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3369" ],
+   "template_args" : [ "type-1973" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3335",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3336" ],
+   "template_args" : [ "type-1938" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemElmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3384",
-   "self_type" : "type-3384",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3385" ],
+   "template_args" : [ "type-1990" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJ19android_dataspace_tEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3403",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3404" ],
+   "template_args" : [ "type-2010" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool> >",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3392" ],
+   "template_args" : [ "type-1997" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3409",
-   "self_type" : "type-3409",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3410" ],
+   "template_args" : [ "type-2017" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_7String8EPS7_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &> >",
-   "referenced_type" : "type-3380",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3381" ],
+   "template_args" : [ "type-1986" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_7String8EEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3362",
-   "self_type" : "type-3362",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3363" ],
+   "template_args" : [ "type-1966" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3348" ],
+   "template_args" : [ "type-1951" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3353",
-   "self_type" : "type-3353",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3354" ],
+   "template_args" : [ "type-1957" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJimRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int> >",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3343",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3344" ],
+   "template_args" : [ "type-1946" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3399",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3400" ],
+   "template_args" : [ "type-2006" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_2spINS_12NativeHandleEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3374",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3375" ],
+   "template_args" : [ "type-1979" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjjEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int> >",
-   "referenced_type" : "type-3395",
-   "self_type" : "type-3395",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3396" ],
+   "template_args" : [ "type-2001" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long *> >",
-   "referenced_type" : "type-3370",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3371" ],
+   "template_args" : [ "type-1975" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long> >",
-   "referenced_type" : "type-3389",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3390" ],
+   "template_args" : [ "type-1995" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long, unsigned long>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long, unsigned long>, tuple<> >",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3341",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3342" ],
+   "template_args" : [ "type-1944" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemElmEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long>, tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long>, tuple<unsigned long> >",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3339",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3340" ],
+   "template_args" : [ "type-1942" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemElEEEJNS5_IJmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long, unsigned long> >",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3337",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3338" ],
+   "template_args" : [ "type-1940" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJlmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8, String8>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8, String8>, tuple<> >",
-   "referenced_type" : "type-3413",
-   "self_type" : "type-3413",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3414" ],
+   "template_args" : [ "type-2021" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8ES6_EEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<> >",
-   "referenced_type" : "type-3382",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3383" ],
+   "template_args" : [ "type-1988" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8EEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<String8 *> >",
-   "referenced_type" : "type-3411",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3412" ],
+   "template_args" : [ "type-2019" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8EEEEJNS5_IJPS6_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<android_dataspace_t>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<android_dataspace_t>, tuple<> >",
-   "referenced_type" : "type-3387",
-   "self_type" : "type-3387",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3388" ],
+   "template_args" : [ "type-1993" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJ19android_dataspace_tEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool, vector<Segment, allocator<Segment> > >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool, vector<Segment, allocator<Segment> > >, tuple<> >",
-   "referenced_type" : "type-3407",
-   "self_type" : "type-3407",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3408" ],
+   "template_args" : [ "type-2015" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<> >",
-   "referenced_type" : "type-3393",
-   "self_type" : "type-3393",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3394" ],
+   "template_args" : [ "type-1999" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3405",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3406" ],
+   "template_args" : [ "type-2012" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbEEEJNS5_IJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, sp<GraphicBuffer> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, sp<GraphicBuffer> >, tuple<> >",
-   "referenced_type" : "type-3351",
-   "self_type" : "type-3351",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3352" ],
+   "template_args" : [ "type-1955" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long, sp<Fence> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long, sp<Fence> >, tuple<> >",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3360",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3361" ],
+   "template_args" : [ "type-1964" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJimNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long>, tuple<const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long>, tuple<const sp<Fence> &> >",
-   "referenced_type" : "type-3358",
-   "self_type" : "type-3358",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3359" ],
+   "template_args" : [ "type-1962" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJimEEEJNS5_IJRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<> >",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3345",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3346" ],
+   "template_args" : [ "type-1949" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3349",
-   "self_type" : "type-3349",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3350" ],
+   "template_args" : [ "type-1953" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3356",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3357" ],
+   "template_args" : [ "type-1960" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJmRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener> >, tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener> >, tuple<bool> >",
-   "referenced_type" : "type-3364",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3365" ],
+   "template_args" : [ "type-1968" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_17IConsumerListenerEEEEEEJNS5_IJbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener>, bool>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener>, bool>, tuple<> >",
-   "referenced_type" : "type-3366",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3367" ],
+   "template_args" : [ "type-1971" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_17IConsumerListenerEEEbEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<NativeHandle> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<NativeHandle> >, tuple<> >",
-   "referenced_type" : "type-3401",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3402" ],
+   "template_args" : [ "type-2008" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_12NativeHandleEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int, unsigned int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int, unsigned int>, tuple<> >",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3379" ],
+   "template_args" : [ "type-1984" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjjEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<> >",
-   "referenced_type" : "type-3397",
-   "self_type" : "type-3397",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3398" ],
+   "template_args" : [ "type-2004" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<unsigned int> >",
-   "referenced_type" : "type-3376",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3377" ],
+   "template_args" : [ "type-1982" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long>, tuple<> >",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3373" ],
+   "template_args" : [ "type-1977" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJmEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long, unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long, unsigned long>>",
-   "referenced_type" : "type-3293",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3294" ],
+   "template_args" : [ "type-1891" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemElmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3333",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3334" ],
+   "template_args" : [ "type-1935" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_7String8EEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<android_dataspace_t>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<android_dataspace_t>>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3324" ],
+   "template_args" : [ "type-1924" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJ19android_dataspace_tEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool, vector<Segment, allocator<Segment> > *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool, vector<Segment, allocator<Segment> > *>>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3328" ],
+   "template_args" : [ "type-1929" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool>>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3313",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3314" ],
+   "template_args" : [ "type-1913" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJbEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &, String8 *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &, String8 *>>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3331",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3332" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_7String8EPS6_EEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &>>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3321",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3322" ],
+   "template_args" : [ "type-1922" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_7String8EEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<Fence> &>>",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3310" ],
+   "template_args" : [ "type-1909" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<GraphicBuffer> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<GraphicBuffer> &>>",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3304" ],
+   "template_args" : [ "type-1902" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<IConsumerListener> &, bool>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<IConsumerListener> &, bool>>",
-   "referenced_type" : "type-3311",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3312" ],
+   "template_args" : [ "type-1911" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int *, const sp<GraphicBuffer> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int *, const sp<GraphicBuffer> &>>",
-   "referenced_type" : "type-3301",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3302" ],
+   "template_args" : [ "type-1900" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long, const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long, const sp<Fence> &>>",
-   "referenced_type" : "type-3305",
-   "self_type" : "type-3305",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3306" ],
+   "template_args" : [ "type-1905" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int>>",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3300" ],
+   "template_args" : [ "type-1898" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long, unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long, unsigned long>>",
-   "referenced_type" : "type-3295",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3296" ],
+   "template_args" : [ "type-1894" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJlmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<sp<NativeHandle> *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<sp<NativeHandle> *>>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3325",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3326" ],
+   "template_args" : [ "type-1927" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int, unsigned int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int, unsigned int>>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3318" ],
+   "template_args" : [ "type-1918" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjjEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int>>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3320" ],
+   "template_args" : [ "type-1920" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long *>>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3315",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3316" ],
+   "template_args" : [ "type-1916" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long, const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long, const sp<Fence> &>>",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3307",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3308" ],
+   "template_args" : [ "type-1907" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJmRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long>>",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3297",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3298" ],
+   "template_args" : [ "type-1896" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<vector<Segment, allocator<Segment> > *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<vector<Segment, allocator<Segment> > *>>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3329",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3330" ],
+   "template_args" : [ "type-1931" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -55040,9 +55031,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55618,525 +55606,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2994",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2995", "type-2996" ],
+   "template_args" : [ "type-1546", "type-1547" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
-   "referenced_type" : "type-2997",
-   "self_type" : "type-2997",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2998", "type-2999" ],
+   "template_args" : [ "type-1549", "type-1550" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_10BufferItemEEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::DecayedElementsMatch<0, std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::DecayedElementsMatch<0, std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
-   "referenced_type" : "type-2991",
-   "self_type" : "type-2991",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2992", "type-2993" ],
+   "template_args" : [ "type-1542", "type-1543" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_10BufferItemEEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::IsPointerIfDecayed<const android::BufferItem &>",
    "name" : "android::SafeBpInterface<IConsumerListener>::IsPointerIfDecayed<const android::BufferItem &>",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-3000",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1551",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2981" ],
+   "template_args" : [ "type-1533" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE18IsPointerIfDecayedIRKNS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-3233",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1817",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3234", "type-3235" ],
+   "template_args" : [ "type-1818", "type-1819" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3218",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1801",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3219", "type-3220" ],
+   "template_args" : [ "type-1802", "type-1803" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3245",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1830",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3246", "type-3247" ],
+   "template_args" : [ "type-1831", "type-1832" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJR19android_dataspace_tEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3260",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1847",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3261", "type-3262" ],
+   "template_args" : [ "type-1848", "type-1849" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &>, std::tuple<bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &>, std::tuple<bool> >",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1837",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3252", "type-3253" ],
+   "template_args" : [ "type-1838", "type-1839" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRbEEENS5_IJbEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3263",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1850",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3264", "type-3265" ],
+   "template_args" : [ "type-1851", "type-1852" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &>, std::tuple<const String8 &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &>, std::tuple<const String8 &> >",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3242",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1827",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3243", "type-3244" ],
+   "template_args" : [ "type-1828", "type-1829" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_7String8EEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3230",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1814",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3231", "type-3232" ],
+   "template_args" : [ "type-1815", "type-1816" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3227",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1811",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3228", "type-3229" ],
+   "template_args" : [ "type-1812", "type-1813" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &>, std::tuple<int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &>, std::tuple<int> >",
-   "referenced_type" : "type-3221",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3222", "type-3223" ],
+   "template_args" : [ "type-1805", "type-1806" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiEEENS5_IJiEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3224",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1807",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3225", "type-3226" ],
+   "template_args" : [ "type-1808", "type-1809" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3257",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1844",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3258", "type-3259" ],
+   "template_args" : [ "type-1845", "type-1846" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_2spINS_12NativeHandleEEEEEENS5_IJS9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3239",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1824",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3240", "type-3241" ],
+   "template_args" : [ "type-1825", "type-1826" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &>, std::tuple<unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &>, std::tuple<unsigned int> >",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3254",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1840",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3255", "type-3256" ],
+   "template_args" : [ "type-1841", "type-1842" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long &>, std::tuple<unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long &>, std::tuple<unsigned long> >",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3248",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1834",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3249", "type-3250" ],
+   "template_args" : [ "type-1835", "type-1836" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRmEEENS5_IJmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3236",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1820",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3237", "type-3238" ],
+   "template_args" : [ "type-1821", "type-1822" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPmEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3146",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3147", "type-3148" ],
+   "template_args" : [ "type-1722", "type-1723" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3191",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1771",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3192", "type-3193" ],
+   "template_args" : [ "type-1772", "type-1773" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJR19android_dataspace_tEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3206",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1787",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3207", "type-3208" ],
+   "template_args" : [ "type-1788", "type-1789" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &>, std::tuple<bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &>, std::tuple<bool> >",
-   "referenced_type" : "type-3197",
-   "self_type" : "type-3197",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1778",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3198", "type-3199" ],
+   "template_args" : [ "type-1779", "type-1780" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRbEEENS5_IJbEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1794",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3213", "type-3214" ],
+   "template_args" : [ "type-1795", "type-1796" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &>, std::tuple<const String8 &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &>, std::tuple<const String8 &> >",
-   "referenced_type" : "type-3188",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1768",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3189", "type-3190" ],
+   "template_args" : [ "type-1769", "type-1770" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_7String8EEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3173",
-   "self_type" : "type-3173",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1751",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3174", "type-3175" ],
+   "template_args" : [ "type-1752", "type-1753" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3164",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1741",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3165", "type-3166" ],
+   "template_args" : [ "type-1742", "type-1743" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &>, std::tuple<int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &>, std::tuple<int> >",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1731",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3156", "type-3157" ],
+   "template_args" : [ "type-1732", "type-1733" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRiEEENS5_IJiEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1735",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3159", "type-3160" ],
+   "template_args" : [ "type-1736", "type-1737" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3203",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1784",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3204", "type-3205" ],
+   "template_args" : [ "type-1785", "type-1786" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPNS_2spINS_12NativeHandleEEEEEENS5_IJS9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3182",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-1761",
+   "self_type" : "type-1761",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3183", "type-3184" ],
+   "template_args" : [ "type-1762", "type-1763" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &>, std::tuple<unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &>, std::tuple<unsigned int> >",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1781",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3201", "type-3202" ],
+   "template_args" : [ "type-1782", "type-1783" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long &>, std::tuple<unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long &>, std::tuple<unsigned long> >",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1774",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3195", "type-3196" ],
+   "template_args" : [ "type-1775", "type-1776" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRmEEENS5_IJmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3179",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3180", "type-3181" ],
+   "template_args" : [ "type-1759", "type-1760" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPmEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3149",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1725",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3150", "type-3151" ],
+   "template_args" : [ "type-1726", "type-1727" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1791",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3210", "type-3211" ],
+   "template_args" : [ "type-1792", "type-1793" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3215",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1797",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3216", "type-3217" ],
+   "template_args" : [ "type-1798", "type-1799" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3176",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3177", "type-3178" ],
+   "template_args" : [ "type-1755", "type-1756" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3167",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3168", "type-3169" ],
+   "template_args" : [ "type-1746", "type-1747" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3161",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1738",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3162", "type-3163" ],
+   "template_args" : [ "type-1739", "type-1740" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3185",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1764",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3186", "type-3187" ],
+   "template_args" : [ "type-1765", "type-1766" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1728",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3153", "type-3154" ],
+   "template_args" : [ "type-1729", "type-1730" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm2ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3170",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1748",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3171", "type-3172" ],
+   "template_args" : [ "type-1749", "type-1750" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm2ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1853",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3267" ],
+   "template_args" : [ "type-1854" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::String8 *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::String8 *&>",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3290" ],
+   "template_args" : [ "type-1886" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::sp<android::NativeHandle> *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::sp<android::NativeHandle> *&>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3284",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1879",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3285" ],
+   "template_args" : [ "type-1880" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_2spINS_12NativeHandleEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android_dataspace_t &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android_dataspace_t &>",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1878",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-768" ],
@@ -56146,8 +56134,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1871",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56157,41 +56145,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1937" ],
+   "template_args" : [ "type-1876" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::Fence> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::Fence> &>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3274",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1804" ],
+   "template_args" : [ "type-1863" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_5FenceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::GraphicBuffer> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::GraphicBuffer> &>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3272",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1663" ],
+   "template_args" : [ "type-1861" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_13GraphicBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::IConsumerListener> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::IConsumerListener> &>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3276",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-945" ],
@@ -56201,8 +56189,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-200" ],
@@ -56212,41 +56200,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-3271",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2959" ],
+   "template_args" : [ "type-1509" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long &>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2890" ],
+   "template_args" : [ "type-1430" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&>",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1883",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3288" ],
+   "template_args" : [ "type-1884" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned int &>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3280",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-764" ],
@@ -56256,8 +56244,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
-   "referenced_type" : "type-3269",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56267,11 +56255,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3278",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3279" ],
+   "template_args" : [ "type-1873" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
   },
   {
@@ -56279,7 +56267,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2949"
+     "referenced_type" : "type-1495"
     }
    ],
    "fields" :
@@ -56294,11 +56282,11 @@
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2987",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2989" ],
+   "template_args" : [ "type-1539" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56332,9 +56320,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56457,7 +56442,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3061"
+     "referenced_type" : "type-1625"
     }
    ],
    "fields" :
@@ -56472,11 +56457,11 @@
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3144" ],
+   "template_args" : [ "type-1719" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56667,198 +56652,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-3121",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3122" ],
+   "template_args" : [ "type-1695" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long, unsigned long)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long, unsigned long)>",
-   "referenced_type" : "type-3111",
-   "self_type" : "type-3111",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3112" ],
+   "template_args" : [ "type-1684" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemElmEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(android_dataspace_t)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(android_dataspace_t)>",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3130" ],
+   "template_args" : [ "type-1704" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFi19android_dataspace_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool)>",
-   "referenced_type" : "type-3133",
-   "self_type" : "type-3133",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3134" ],
+   "template_args" : [ "type-1708" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFibEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool, vector<Segment, allocator<Segment> > *)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool, vector<Segment, allocator<Segment> > *)>",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3140" ],
+   "template_args" : [ "type-1715" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFibPNSt3__16vectorINS_16OccupancyTracker7SegmentENS3_9allocatorIS6_EEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &)>",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3127",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3128" ],
+   "template_args" : [ "type-1702" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiRKNS_7String8EEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &, String8 *) const>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &, String8 *) const>",
-   "referenced_type" : "type-3141",
-   "self_type" : "type-3141",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3142" ],
+   "template_args" : [ "type-1717" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEKFiRKNS_7String8EPS3_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const sp<IConsumerListener> &, bool)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const sp<IConsumerListener> &, bool)>",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3119",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3120" ],
+   "template_args" : [ "type-1693" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiRKNS_2spINS_17IConsumerListenerEEEbEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int *, const sp<GraphicBuffer> &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int *, const sp<GraphicBuffer> &)>",
-   "referenced_type" : "type-3115",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3116" ],
+   "template_args" : [ "type-1688" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPiRKNS_2spINS_13GraphicBufferEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int)>",
-   "referenced_type" : "type-3113",
-   "self_type" : "type-3113",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3114" ],
+   "template_args" : [ "type-1686" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long, const sp<Fence> &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long, const sp<Fence> &)>",
-   "referenced_type" : "type-3117",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3118" ],
+   "template_args" : [ "type-1691" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiimRKNS_2spINS_5FenceEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(sp<NativeHandle> *) const>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(sp<NativeHandle> *) const>",
-   "referenced_type" : "type-3137",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3138" ],
+   "template_args" : [ "type-1713" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEKFiPNS_2spINS_12NativeHandleEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int)>",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3136" ],
+   "template_args" : [ "type-1710" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int, unsigned int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int, unsigned int)>",
-   "referenced_type" : "type-3125",
-   "self_type" : "type-3125",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3126" ],
+   "template_args" : [ "type-1699" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long *)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long *)>",
-   "referenced_type" : "type-3123",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3124" ],
+   "template_args" : [ "type-1697" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPmEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long)>",
-   "referenced_type" : "type-3131",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3132" ],
+   "template_args" : [ "type-1706" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFimEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
-   "referenced_type" : "type-2982",
-   "self_type" : "type-2982",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1534",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2983" ],
+   "template_args" : [ "type-1535" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvvEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)(const BufferItem &)>",
    "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)(const BufferItem &)>",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2986" ],
+   "template_args" : [ "type-1537" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56884,8 +56869,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-3109",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56895,8 +56880,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
-   "referenced_type" : "type-3106",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-11" ],
@@ -56906,8 +56891,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
-   "referenced_type" : "type-3108",
-   "self_type" : "type-3108",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56917,8 +56902,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
-   "referenced_type" : "type-3104",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1675",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-32" ],
@@ -57037,11 +57022,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-2810",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-2811" ],
+   "template_args" : [ "type-1356" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57331,7 +57316,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -57346,8 +57331,8 @@
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1670",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57555,7 +57540,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -57570,18 +57555,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-2410"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57763,11 +57748,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2679",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1963" ],
+   "template_args" : [ "type-2680" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57928,11 +57913,11 @@
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2817" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57983,11 +57968,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2812",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2813" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -58093,8 +58078,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2688",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58276,13 +58261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-2399"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58303,8 +58288,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58325,8 +58310,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58342,7 +58327,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-2403"
     },
     {
      "field_name" : "nFenceFd",
@@ -58352,8 +58337,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58363,14 +58348,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1626",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58417,30 +58402,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-1888" ],
+   "template_args" : [ "type-4", "type-2609" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-1885" ],
+   "template_args" : [ "type-4", "type-2606" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2604",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58642,8 +58627,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58664,8 +58649,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4042",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58687,8 +58672,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4698",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-124" ],
@@ -58710,8 +58695,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4025",
-   "self_type" : "type-4025",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4685",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-254" ],
@@ -58733,8 +58718,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-4009",
-   "self_type" : "type-4009",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4669",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-124" ],
@@ -58756,11 +58741,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *>",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4066",
+   "referenced_type" : "type-4726",
+   "self_type" : "type-4726",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4067", "type-4067" ],
+   "template_args" : [ "type-4727", "type-4727" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58779,11 +58764,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4073",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4067", "type-4074" ],
+   "template_args" : [ "type-4727", "type-4734" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58802,8 +58787,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4046",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-99" ],
@@ -58825,8 +58810,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-4050",
-   "self_type" : "type-4050",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-91" ],
@@ -58848,11 +58833,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4737",
+   "self_type" : "type-4737",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4074", "type-4067" ],
+   "template_args" : [ "type-4734", "type-4727" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58871,11 +58856,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-4084",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4744",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4074", "type-4074" ],
+   "template_args" : [ "type-4734", "type-4734" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58894,8 +58879,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-4053",
-   "self_type" : "type-4053",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-99" ],
@@ -58917,8 +58902,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4059",
+   "referenced_type" : "type-4719",
+   "self_type" : "type-4719",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-91" ],
@@ -58937,8 +58922,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-4000",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4660",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58950,14 +58935,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4095"
+     "referenced_type" : "type-4755"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4094",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4754",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58969,14 +58954,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4047"
+     "referenced_type" : "type-4707"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4065",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4725",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58988,14 +58973,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-3997"
+     "referenced_type" : "type-4657"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4099",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4759",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -59013,11 +58998,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-1803" ],
+   "template_args" : [ "type-2525" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -59056,7 +59041,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2815"
+     "referenced_type" : "type-1360"
     }
    ],
    "fields" :
@@ -59077,7 +59062,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-2819"
+     "referenced_type" : "type-1364"
     },
     {
      "access" : "private",
@@ -59089,8 +59074,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59206,7 +59191,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-2829"
+     "referenced_type" : "type-1373"
     },
     {
      "access" : "private",
@@ -59218,14 +59203,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-2830"
+     "referenced_type" : "type-1374"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2828",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59444,8 +59429,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59561,8 +59546,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-2827",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59649,8 +59634,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2833",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59732,13 +59717,13 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-2852"
+     "referenced_type" : "type-1394"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-2816"
+     "referenced_type" : "type-1361"
     },
     {
      "access" : "private",
@@ -59762,13 +59747,13 @@
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-2834"
+     "referenced_type" : "type-1378"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-2834"
+     "referenced_type" : "type-1378"
     },
     {
      "access" : "private",
@@ -59810,7 +59795,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-2859"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
@@ -59828,26 +59813,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-2860"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-2825"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-2850"
+     "referenced_type" : "type-1392"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1393",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59865,7 +59850,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-2835"
+     "referenced_type" : "type-1379"
     },
     {
      "access" : "private",
@@ -59949,7 +59934,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-2837"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -59961,8 +59946,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59989,8 +59974,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-2840",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -60022,13 +60007,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-2856"
+     "referenced_type" : "type-1398"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-2857"
+     "referenced_type" : "type-1399"
     },
     {
      "access" : "private",
@@ -60058,7 +60043,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-2812"
+     "referenced_type" : "type-1357"
     },
     {
      "access" : "private",
@@ -60070,7 +60055,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-2849"
+     "referenced_type" : "type-1391"
     },
     {
      "access" : "private",
@@ -60082,7 +60067,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-2822"
+     "referenced_type" : "type-1367"
     },
     {
      "access" : "private",
@@ -60118,14 +60103,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-2850"
+     "referenced_type" : "type-1392"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2855",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60203,7 +60188,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-2814"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "refs",
@@ -60213,8 +60198,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1358",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60239,8 +60224,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7522",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60260,17 +60245,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1738"
+     "referenced_type" : "type-2465"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4362",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1738" ],
+   "template_args" : [ "type-2465" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60287,17 +60272,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-2456"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3831",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4491",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1729" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60314,17 +60299,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1751"
+     "referenced_type" : "type-2478"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3710",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4368",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1751" ],
+   "template_args" : [ "type-2478" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60341,17 +60326,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1745"
+     "referenced_type" : "type-2472"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3837",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4497",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1745" ],
+   "template_args" : [ "type-2472" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60374,8 +60359,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3698",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4356",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-95" ],
@@ -60428,8 +60413,8 @@
    "linker_set_key" : "android::hardware::Return<unsigned long>",
    "name" : "android::hardware::Return<unsigned long>",
    "record_kind" : "class",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4813",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7526",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-11" ],
@@ -60622,8 +60607,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-358",
    "self_type" : "type-358",
@@ -60646,8 +60631,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-351",
    "self_type" : "type-351",
@@ -60670,8 +60655,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-374",
    "self_type" : "type-374",
@@ -60784,8 +60769,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-349",
    "self_type" : "type-349",
@@ -60826,8 +60811,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-341",
    "self_type" : "type-341",
@@ -60850,8 +60835,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-383",
    "self_type" : "type-383",
@@ -60892,8 +60877,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-355",
    "self_type" : "type-355",
@@ -60934,8 +60919,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-392",
    "self_type" : "type-392",
@@ -61500,8 +61485,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -64172,17 +64157,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3574"
+     "referenced_type" : "type-4232"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3573",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3576" ],
+   "template_args" : [ "type-4234" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64192,17 +64177,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3795"
+     "referenced_type" : "type-4454"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3798",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3799" ],
+   "template_args" : [ "type-4458" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64272,17 +64257,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1798"
+     "referenced_type" : "type-1866"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1800" ],
+   "template_args" : [ "type-1868" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64378,8 +64363,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64392,17 +64377,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3601"
+     "referenced_type" : "type-4259"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3605" ],
+   "template_args" : [ "type-4263" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64412,17 +64397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3610"
+     "referenced_type" : "type-4268"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3614" ],
+   "template_args" : [ "type-4272" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64432,17 +64417,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4169"
+     "referenced_type" : "type-4831"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4168",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4171" ],
+   "template_args" : [ "type-4833" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64452,17 +64437,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5057"
+     "referenced_type" : "type-5112"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5056",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5111",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5059" ],
+   "template_args" : [ "type-5114" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64712,17 +64697,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2817"
+     "referenced_type" : "type-1362"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2859",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2818" ],
+   "template_args" : [ "type-1363" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64732,17 +64717,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2814"
+     "referenced_type" : "type-1359"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2823",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2815" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64752,17 +64737,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2854"
+     "referenced_type" : "type-1396"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2855" ],
+   "template_args" : [ "type-1397" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64772,14 +64757,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1739"
+     "referenced_type" : "type-2466"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64792,17 +64777,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-2457"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1731" ],
+   "template_args" : [ "type-2458" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64812,17 +64797,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3586"
+     "referenced_type" : "type-4244"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3585",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3588" ],
+   "template_args" : [ "type-4246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64832,17 +64817,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3807"
+     "referenced_type" : "type-4467"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3810",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3811" ],
+   "template_args" : [ "type-4471" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64852,14 +64837,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-2479"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1751",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64872,14 +64857,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1746"
+     "referenced_type" : "type-2473"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64892,17 +64877,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3580"
+     "referenced_type" : "type-4238"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3579",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3582" ],
+   "template_args" : [ "type-4240" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64912,17 +64897,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3800"
+     "referenced_type" : "type-4459"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3803",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3804" ],
+   "template_args" : [ "type-4464" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64952,14 +64937,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-2447"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-531" ],
@@ -64972,14 +64957,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-2451"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-534" ],
@@ -64992,17 +64977,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1792"
+     "referenced_type" : "type-2519"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1793" ],
+   "template_args" : [ "type-2520" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
@@ -65020,8 +65005,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-2590",
+   "self_type" : "type-2590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65031,8 +65016,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65042,8 +65027,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65064,8 +65049,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65086,30 +65071,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-2592" ],
    "unique_id" : "_ZTSN7android13trait_pointerINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1868" ],
+   "template_args" : [ "type-2589" ],
    "unique_id" : "_ZTSN7android13trait_pointerINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65130,8 +65115,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65141,8 +65126,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2571",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65152,8 +65137,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2568",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65174,8 +65159,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65185,8 +65170,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2501",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65218,8 +65203,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65251,8 +65236,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65262,30 +65247,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1852" ],
+   "template_args" : [ "type-2573" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1849" ],
+   "template_args" : [ "type-2570" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65328,8 +65313,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65339,8 +65324,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65361,8 +65346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65372,8 +65357,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65383,8 +65368,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65405,8 +65390,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65416,8 +65401,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65449,8 +65434,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65482,8 +65467,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65493,30 +65478,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1837" ],
+   "template_args" : [ "type-2558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1833" ],
+   "template_args" : [ "type-2554" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65526,8 +65511,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65559,8 +65544,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2618",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65570,8 +65555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65592,8 +65577,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65603,8 +65588,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65614,8 +65599,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2559",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65636,8 +65621,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65647,8 +65632,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65680,8 +65665,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65713,8 +65698,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65724,30 +65709,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1844" ],
+   "template_args" : [ "type-2565" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1840" ],
+   "template_args" : [ "type-2561" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65757,8 +65742,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65790,8 +65775,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-1905",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65801,8 +65786,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65823,8 +65808,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "template_args" : [ "type-1240" ],
@@ -65834,8 +65819,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-123" ],
@@ -65845,8 +65830,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65856,8 +65841,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2578",
+   "self_type" : "type-2578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65867,8 +65852,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65889,8 +65874,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1747",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65900,8 +65885,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65933,8 +65918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65966,8 +65951,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2607",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65977,30 +65962,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-2580" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1856" ],
+   "template_args" : [ "type-2577" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -66043,8 +66028,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1927",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -66054,8 +66039,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66076,8 +66061,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-2601",
+   "self_type" : "type-2601",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66087,8 +66072,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66098,8 +66083,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66120,8 +66105,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66142,30 +66127,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-2603" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-2600" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66193,13 +66178,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1918"
+     "referenced_type" : "type-2638"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66210,13 +66195,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1915"
+     "referenced_type" : "type-2635"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66227,13 +66212,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1911"
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66261,13 +66246,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1913"
+     "referenced_type" : "type-2633"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66716,13 +66701,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-2179"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66733,15 +66718,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-2180"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1350"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1350"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v3",
@@ -66753,15 +66738,15 @@
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-2181"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -66782,8 +66767,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2510",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66829,8 +66814,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66990,8 +66975,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1409",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -67035,8 +67020,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2612",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -67053,8 +67038,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4811",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7524",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67062,8 +67047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &&",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3706",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67071,8 +67056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &&",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3833",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67080,8 +67065,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &&",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3712",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4370",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67089,8 +67074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3839",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4499",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67098,8 +67083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3700",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67116,8 +67101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &&",
    "name" : "android::hardware::Return<unsigned long> &&",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4815",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7530",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67171,7 +67156,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-453",
-   "self_type" : "type-3909",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67180,7 +67165,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-322",
-   "self_type" : "type-1529",
+   "self_type" : "type-2258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67197,8 +67182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67206,8 +67191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67215,8 +67200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67224,8 +67209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3615",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67233,8 +67218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4178",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4840",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67242,8 +67227,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67252,7 +67237,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-844",
-   "self_type" : "type-3727",
+   "self_type" : "type-4386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67261,7 +67246,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-940",
-   "self_type" : "type-3024",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67270,7 +67255,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-3042",
+   "self_type" : "type-1601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67279,7 +67264,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-3571",
+   "self_type" : "type-4229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67288,7 +67273,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-958",
-   "self_type" : "type-3597",
+   "self_type" : "type-4255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67297,7 +67282,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-933",
-   "self_type" : "type-3037",
+   "self_type" : "type-1597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/arm64_armv8-a/source-based/libstagefright_softomx.so.lsdump b/Q/64/arm64_armv8-a/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 0c77e06..0000000
--- a/Q/64/arm64_armv8-a/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28466 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-459",
-   "self_type" : "type-461",
-   "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-449",
-   "self_type" : "type-450",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-391",
-   "self_type" : "type-394",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
-   "size" : 2560,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-80",
-   "self_type" : "type-323",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-108",
-   "self_type" : "type-759",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-196",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-538",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-538",
-   "self_type" : "type-537",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-539",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-635",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-226",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-636",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-321",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-632",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-172",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_mmm"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhmmPKhmmmb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhmmP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhmPKhmmm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-29",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-29",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-265",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-265",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-265",
-   "self_type" : "type-295",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-265",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-265",
-   "self_type" : "type-306",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-302"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-265",
-   "self_type" : "type-301",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-276",
-   "return_type" : "type-265",
-   "self_type" : "type-276",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-279",
-   "return_type" : "type-265",
-   "self_type" : "type-279",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-265",
-   "self_type" : "type-285",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-265",
-   "self_type" : "type-282",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-273"
-    },
-    {
-     "referenced_type" : "type-273"
-    },
-    {
-     "referenced_type" : "type-274"
-    }
-   ],
-   "referenced_type" : "type-272",
-   "return_type" : "type-265",
-   "self_type" : "type-272",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-265",
-   "self_type" : "type-308",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-265",
-   "self_type" : "type-297",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-289"
-    }
-   ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-265",
-   "self_type" : "type-288",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-265",
-   "self_type" : "type-268",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-266"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-265",
-   "self_type" : "type-264",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-768",
-   "return_type" : "type-29",
-   "self_type" : "type-768",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-269"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-266"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-349",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-733",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-238"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    },
-    {
-     "referenced_type" : "type-794"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-925"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-790"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    },
-    {
-     "referenced_type" : "type-794"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-62",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-794"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-312"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_mmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-381"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhmmPKhmmmb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-680"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhmmP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-401"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-113",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-941"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhmPKhmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-379"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-313",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-722",
-   "self_type" : "type-727",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-733",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-126",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-774",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-783",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-700",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-257",
-   "self_type" : "type-710",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-708",
-   "self_type" : "type-709",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-240",
-   "self_type" : "type-705",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-965",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-385",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-220",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-923",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-669",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-679",
-   "self_type" : "type-790",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-456",
-   "self_type" : "type-477",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-724",
-   "self_type" : "type-725",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-123",
-   "self_type" : "type-124",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-361",
-   "self_type" : "type-704",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-962",
-   "self_type" : "type-964",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-342",
-   "self_type" : "type-346",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-386",
-   "self_type" : "type-388",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-193",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-822",
-   "self_type" : "type-840",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-639",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-924",
-   "self_type" : "type-925",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-629",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-396",
-   "self_type" : "type-409",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-429",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-318",
-   "self_type" : "type-382",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const long &",
-   "name" : "const long &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-432",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-423",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-347",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long &",
-   "name" : "const unsigned long &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-433",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-428",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long &",
-   "name" : "unsigned long &",
-   "referenced_type" : "type-48",
-   "self_type" : "type-399",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-100",
-   "self_type" : "type-398",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-213",
-   "self_type" : "type-212",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-302",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-269",
-   "self_type" : "type-789",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-295",
-   "self_type" : "type-294",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-306",
-   "self_type" : "type-305",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-276",
-   "self_type" : "type-275",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
-   "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-282",
-   "self_type" : "type-281",
-   "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-272",
-   "self_type" : "type-271",
-   "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-308",
-   "self_type" : "type-307",
-   "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-297",
-   "self_type" : "type-296",
-   "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-288",
-   "self_type" : "type-287",
-   "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-268",
-   "self_type" : "type-267",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-264",
-   "self_type" : "type-263",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-283",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-686",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-286",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-273",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-235",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-917",
-   "self_type" : "type-918",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-111",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-777",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-37",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-419",
-   "self_type" : "type-418",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-707",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-723",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-718",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-730",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-129",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-772",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-972",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-237",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-257",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-240",
-   "self_type" : "type-349",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-678",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-310",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-375",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-690",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-966",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-695",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-701",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-552",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-348",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-179",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-793",
-   "self_type" : "type-810",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-930",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-232",
-   "self_type" : "type-927",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-920",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-343",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-936",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-935",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-610",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-716",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-757",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-794",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-685",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-381",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-260",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-919",
-   "self_type" : "type-921",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-456",
-   "self_type" : "type-466",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-49",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-726",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-711",
-   "self_type" : "type-712",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-734",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-26",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-442",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-941",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-379",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-692",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-963",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-699",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-689",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-354",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-311",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-931",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-929",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-924",
-   "self_type" : "type-926",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-676",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-752",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-353",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-200",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-768",
-   "self_type" : "type-769",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-436",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-209",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-274",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-214",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-100",
-   "self_type" : "type-771",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-350",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-257",
-   "self_type" : "type-708",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-683",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-681",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-213",
-   "self_type" : "type-380",
-   "size" : 112,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-679",
-   "size" : 112,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-357",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-64",
-   "self_type" : "type-140",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-70",
-   "self_type" : "type-934",
-   "size" : 88,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-73",
-   "self_type" : "type-787",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-78",
-   "self_type" : "type-456",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-31",
-   "self_type" : "type-315",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-30",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-50",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-256",
-   "self_type" : "type-711",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-731",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-59",
-   "self_type" : "type-135",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-130",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-61",
-   "self_type" : "type-116",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-90",
-   "self_type" : "type-441",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-231",
-   "self_type" : "type-940",
-   "size" : 176,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-253",
-   "self_type" : "type-355",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-240",
-   "self_type" : "type-361",
-   "size" : 176,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-259",
-   "self_type" : "type-953",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-369",
-   "self_type" : "type-378",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-97",
-   "self_type" : "type-691",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-198",
-   "self_type" : "type-359",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-696",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-702",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-99",
-   "self_type" : "type-688",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-342",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-216",
-   "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-387",
-   "self_type" : "type-386",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-62",
-   "self_type" : "type-191",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-233",
-   "self_type" : "type-822",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-639",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-65",
-   "self_type" : "type-924",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-729",
-   "self_type" : "type-938",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-979",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-620",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-236",
-   "self_type" : "type-741",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-80",
-   "self_type" : "type-114",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-113",
-   "self_type" : "type-499",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-109",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-108",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-29",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long",
-   "name" : "const long",
-   "referenced_type" : "type-10",
-   "self_type" : "type-431",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-195",
-   "self_type" : "type-201",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-421",
-   "self_type" : "type-420",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-314",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long",
-   "name" : "const unsigned long",
-   "referenced_type" : "type-48",
-   "self_type" : "type-103",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-427",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-101",
-   "self_type" : "type-402",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-100",
-   "self_type" : "type-792",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-766",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-446"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-533"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-513"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-446"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-529"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-467"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-465"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-462"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-487"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-489"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-486"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-480"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-482"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-484"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 256,
-     "referenced_type" : "type-507"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 288,
-     "referenced_type" : "type-508"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-505"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-462"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-463"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-458"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-461"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-246"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-462"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-476"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-471"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 160,
-     "referenced_type" : "type-246"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-214"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 320,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 384,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 512,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 576,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 704,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-263"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-267"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 128,
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 64,
-     "referenced_type" : "type-303"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 192,
-     "referenced_type" : "type-271"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 256,
-     "referenced_type" : "type-275"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 320,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 384,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 448,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 512,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 576,
-     "referenced_type" : "type-281"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 640,
-     "referenced_type" : "type-284"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 704,
-     "referenced_type" : "type-287"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 768,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 832,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 896,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 960,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 1088,
-     "referenced_type" : "type-300"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 1152,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 1216,
-     "referenced_type" : "type-305"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 1280,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
-   "size" : 168,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-394"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-390"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-537"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-539"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-573"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-557"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-576"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-541"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-666"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1344,
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1408,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1472,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 192,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-549"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-568"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-555"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-626"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-633"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-635"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-636"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-630"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-249"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 384,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-452"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-251"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-251"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-291"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-570"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-571"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-579"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-244"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 832,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 864,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-248"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-250"
-    }
-   ],
-   "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-244",
-   "self_type" : "type-244",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-547"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-655"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-658"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-642"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-643"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 256,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-637"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-641"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-291"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-618"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-607"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-608"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-583"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-593"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-594"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-177"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-178"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-588"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-597"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-598"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-600"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-601"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-605"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-173"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-603"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 128,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 256,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 320,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 384,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 448,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 480,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-916",
-   "self_type" : "type-916",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 320,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 384,
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-70"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 704,
-     "referenced_type" : "type-236"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 448,
-     "referenced_type" : "type-76"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 832,
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 1024,
-     "referenced_type" : "type-81"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 1152,
-     "referenced_type" : "type-85"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 1216,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 1248,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 1568,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 192,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 320,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 448,
-     "referenced_type" : "type-105"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 2624,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 256,
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-110"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-112"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 256,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 320,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-79"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-411" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-407"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-413" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-328"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-329" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-521"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-522" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-712"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-257"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 64,
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 128,
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-82"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-117"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 64,
-     "referenced_type" : "type-60"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 128,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-146"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-147"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-151"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-152"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-774"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcmj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 56,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-91"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-259"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 512,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 832,
-     "referenced_type" : "type-232"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 896,
-     "referenced_type" : "type-233"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 960,
-     "referenced_type" : "type-238"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 992,
-     "referenced_type" : "type-238"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 1024,
-     "referenced_type" : "type-239"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 1344,
-     "referenced_type" : "type-258"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 176,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 64,
-     "referenced_type" : "type-89"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 72,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 896,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 1216,
-     "referenced_type" : "type-254"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 176,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-415" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 320,
-     "referenced_type" : "type-260"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 384,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-971"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-231"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 1352,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 1408,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 1472,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 1504,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 1536,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 1568,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 1632,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 1664,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1888,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1920,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1952,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 2272,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 2400,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 2528,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 2656,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 2688,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 2752,
-     "referenced_type" : "type-113"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 2816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 2880,
-     "referenced_type" : "type-228"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 2944,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 3008,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 3136,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 408,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-231"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 1352,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 1376,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 1408,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 1472,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 1504,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 1536,
-     "referenced_type" : "type-370"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-113"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1728,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1792,
-     "referenced_type" : "type-228"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1856,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 64,
-     "referenced_type" : "type-396"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 512,
-     "referenced_type" : "type-76"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 896,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 928,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 936,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 960,
-     "referenced_type" : "type-763"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 1024,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
-   "size" : 152,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 136,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcim"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 192,
-     "referenced_type" : "type-211"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 256,
-     "referenced_type" : "type-215"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 192,
-     "referenced_type" : "type-102"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-199"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-200"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-209"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-206"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-520"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-913"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-897"
-    }
-   ],
-   "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-896",
-   "self_type" : "type-896",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-888"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-887",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-908"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-825"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-828"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-827"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-829"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-818"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-820"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-817"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-801"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-804" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-802"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-803" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-807"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-808"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-809"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-798"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-799" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-833"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-832"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-835"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-834"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-843"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-842"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-846"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-845"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-849"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-878"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-877",
-   "self_type" : "type-877",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-870"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-869"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-871"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<RefBase> >",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-863"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long>",
-   "name" : "android::is_one_of<long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-852"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-857"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-856"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long>",
-   "name" : "android::is_one_of<unsigned long>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-813"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-812"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-811",
-   "self_type" : "type-811",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-814"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-815"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-69"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-70" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-235" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-73" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-66"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-237"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-259" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-764"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-765" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-933"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-934" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-728",
-   "self_type" : "type-728",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-861",
-   "self_type" : "type-861",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-942",
-   "self_type" : "type-942",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-985",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "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-967",
-   "self_type" : "type-967",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-657",
-   "self_type" : "type-657",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "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-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-52",
-   "self_type" : "type-52",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "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-975",
-   "self_type" : "type-975",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-693",
-   "self_type" : "type-693",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-8",
-   "self_type" : "type-8",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-56",
-   "self_type" : "type-56",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-770",
-   "self_type" : "type-770",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-368"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-374"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-366"
-    }
-   ],
-   "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-365",
-   "self_type" : "type-365",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-70" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-73" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-188"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-755"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-757"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
-   "size" : 16,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-214"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 64,
-     "referenced_type" : "type-753"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 256,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 192,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 256,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 320,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
-   "size" : 80,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-321"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-322"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-322"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-324"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-325"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "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-320",
-   "self_type" : "type-320",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-196"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-62",
-   "self_type" : "type-204",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-232",
-   "self_type" : "type-928",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-729",
-   "self_type" : "type-937",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/arm64_armv8-a/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/arm64_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
index 7f1c0a5..6f209b0 100644
--- a/Q/64/arm64_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 278528,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -38,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
@@ -47,18 +27,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -67,66 +37,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -141,19 +156,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -161,6 +196,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -225,6 +272,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
   },
   {
@@ -245,11 +296,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EElEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKclEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEENS_21__tree_const_iteratorIS6_SI_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEE"
   },
   {
    "binding" : "weak",
@@ -257,7 +344,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -265,6 +376,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -280,389 +403,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-27"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-27"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -672,10 +484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -685,10 +497,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -698,10 +510,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -711,24 +523,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-44",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-25",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -738,10 +536,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -751,24 +549,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-25",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -778,37 +562,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-24",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -816,10 +582,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -827,8 +602,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -836,8 +611,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -849,7 +633,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-26",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -857,8 +641,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-43",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -866,35 +650,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-27",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-50",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -907,8 +664,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
-   "size" : 278760,
+   "self_type" : "type-13",
+   "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -916,8 +673,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -926,19 +683,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-24",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
-   "size" : 32,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -946,8 +703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -956,8 +713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -966,8 +723,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 24,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -980,92 +747,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 128,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 512,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 704,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 896,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 1088,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 2229312,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 2229504,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 2229568,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 2229632,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 2229696,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 2229888,
-     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1073,7 +756,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 278760,
+   "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1083,39 +766,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 64,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 128,
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 320,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 512,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
+     "field_offset" : 704,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 512,
-     "referenced_type" : "type-31"
+     "field_offset" : 896,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 704,
-     "referenced_type" : "type-32"
+     "field_offset" : 1088,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 112,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 160,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1125,18 +818,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1147,23 +840,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 192,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
index 2c6c0a2..2184219 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2200",
    "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-1707",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2250",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3612",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3782",
-   "self_type" : "type-3781",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4205",
-   "self_type" : "type-4204",
+   "referenced_type" : "type-4181",
+   "self_type" : "type-4180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4319",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4730",
-   "self_type" : "type-4729",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4701",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -147,8 +147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -156,8 +156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -165,8 +165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -174,8 +174,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -183,49 +183,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2123",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2263",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -233,8 +224,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -242,143 +233,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2264",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2993",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3374",
-   "self_type" : "type-3373",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3777",
-   "self_type" : "type-3776",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4201",
-   "self_type" : "type-4200",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4314",
-   "self_type" : "type-4313",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4726",
-   "self_type" : "type-4725",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -387,7 +252,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -396,7 +261,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -405,7 +270,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -414,7 +279,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -423,7 +288,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -432,7 +297,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -441,7 +306,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -450,7 +315,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -463,8 +328,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -473,8 +338,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -483,24 +348,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -508,8 +373,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -517,16 +382,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 8
   },
   {
@@ -534,8 +399,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -543,8 +408,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -552,8 +417,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -582,8 +447,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 4
   },
   {
@@ -592,8 +457,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -602,15 +467,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -1033,10 +898,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1174,6 +1039,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1512,6 +1380,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1520,9 +1392,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1598,10 +1486,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1811,7 +1695,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1885,8 +1769,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1963,8 +1847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2017,8 +1901,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2115,8 +1999,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2161,8 +2045,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2211,8 +2095,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2261,8 +2145,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2303,8 +2187,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "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",
@@ -2369,8 +2253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2395,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2437,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2591,8 +2475,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2637,8 +2521,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2679,8 +2563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2737,8 +2621,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2675,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2833,8 +2717,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2879,8 +2763,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2917,8 +2801,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2839,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3013,8 +2897,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3047,8 +2931,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3081,8 +2965,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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",
@@ -3123,8 +3007,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3165,8 +3049,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3191,8 +3075,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3229,8 +3113,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3283,8 +3167,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3525,8 +3409,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3571,8 +3455,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3677,8 +3561,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3719,8 +3603,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3745,8 +3629,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3923,11 +3807,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3997,8 +3881,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4063,8 +3947,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4097,8 +3981,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4143,8 +4027,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4213,8 +4097,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4279,8 +4163,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4329,8 +4213,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4371,8 +4255,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4421,8 +4305,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4463,8 +4347,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4657,8 +4541,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5355,8 +5239,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5517,8 +5401,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5559,8 +5443,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5597,8 +5481,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5635,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5677,8 +5561,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5715,8 +5599,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5745,8 +5629,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5675,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5833,8 +5717,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5883,8 +5767,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5917,8 +5801,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5951,8 +5835,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5989,8 +5873,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5911,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6061,8 +5945,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6099,8 +5983,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6153,8 +6037,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6179,8 +6063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6205,8 +6089,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6311,8 +6195,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6349,8 +6233,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6371,8 +6255,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6425,8 +6309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6463,8 +6347,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6545,8 +6429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6595,8 +6479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6653,8 +6537,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6715,8 +6599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6773,8 +6657,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6961,8 +6845,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7003,8 +6887,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7041,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7083,8 +6967,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7179,8 +7063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7245,8 +7129,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7335,8 +7219,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7393,8 +7277,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7435,8 +7319,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7473,8 +7357,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7499,8 +7383,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7577,8 +7461,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7631,8 +7515,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7673,8 +7557,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7623,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7781,8 +7665,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7839,8 +7723,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7865,8 +7749,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7891,8 +7775,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7937,8 +7821,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7983,8 +7867,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8013,8 +7897,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8071,8 +7955,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8137,8 +8021,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8171,8 +8055,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8237,8 +8121,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8295,8 +8179,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8317,8 +8201,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8335,65 +8219,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8432,8 +8265,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8470,8 +8303,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8500,8 +8333,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8522,8 +8355,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8556,11 +8389,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8582,8 +8415,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8609,8 +8442,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8627,8 +8460,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8645,8 +8478,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8671,8 +8504,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8713,8 +8546,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8775,11 +8608,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8879,8 +8712,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8905,8 +8738,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8947,8 +8780,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9189,8 +9022,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9219,8 +9052,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2108",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9249,8 +9082,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9291,8 +9124,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9329,8 +9162,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9355,8 +9188,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9373,8 +9206,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9403,8 +9236,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9497,8 +9330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9539,8 +9372,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9557,8 +9390,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2114",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9587,8 +9420,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9621,8 +9454,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9675,8 +9508,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9692,12 +9525,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9707,15 +9540,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9725,24 +9558,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9752,27 +9585,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9782,24 +9615,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9809,18 +9642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9830,21 +9663,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9854,18 +9687,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9875,15 +9708,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9893,18 +9726,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9914,24 +9747,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9941,18 +9774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9962,18 +9795,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9983,24 +9816,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10010,18 +9843,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10031,13 +9864,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -10046,12 +9879,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10061,12 +9894,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2156",
-   "return_type" : "type-67",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2128",
+   "return_type" : "type-60",
+   "self_type" : "type-2128",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -10076,27 +9909,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -10108,10 +9941,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -10122,10 +9955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1994"
+     "referenced_type" : "type-1964"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10136,10 +9969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2003"
+     "referenced_type" : "type-1973"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10150,10 +9983,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10163,13 +9996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10179,20 +10012,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10202,7 +10035,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10211,7 +10044,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10221,13 +10054,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10237,26 +10070,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10266,16 +10099,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10285,16 +10118,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2538"
+     "referenced_type" : "type-2526"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10305,22 +10138,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-2522"
     },
     {
-     "referenced_type" : "type-2495"
+     "referenced_type" : "type-2471"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10331,10 +10164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10347,19 +10180,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10370,10 +10203,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10386,19 +10219,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10409,25 +10242,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10438,7 +10271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10453,13 +10286,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10470,13 +10303,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10486,10 +10319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10500,16 +10333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10520,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10529,7 +10362,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10539,13 +10372,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10556,10 +10389,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10570,13 +10403,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10419,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10435,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,7 +10455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10631,7 +10464,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10642,7 +10475,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10651,7 +10484,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10661,16 +10494,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10681,13 +10514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10698,10 +10531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10712,13 +10545,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10728,16 +10561,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10748,13 +10581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10765,7 +10598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10774,7 +10607,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10785,19 +10618,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10808,13 +10641,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10825,19 +10658,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10848,13 +10681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10865,19 +10698,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10887,7 +10720,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10896,16 +10729,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10916,25 +10749,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10945,19 +10778,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10967,16 +10800,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10987,13 +10820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11004,16 +10837,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11023,22 +10856,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11049,19 +10882,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11072,25 +10905,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11100,13 +10933,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -11115,7 +10948,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11126,22 +10959,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11152,22 +10985,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11178,19 +11011,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11200,10 +11033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11213,13 +11046,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11228,10 +11061,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11241,10 +11074,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11253,7 +11086,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11263,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11276,10 +11109,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11289,19 +11122,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11311,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11333,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11349,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11365,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11387,19 +11220,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11409,19 +11242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11432,10 +11265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11446,10 +11279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11460,10 +11293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11472,13 +11305,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11487,13 +11320,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11502,10 +11335,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11514,13 +11347,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11529,19 +11362,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11551,10 +11384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11564,10 +11397,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11577,16 +11410,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11598,7 +11431,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11608,10 +11441,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11621,13 +11454,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11637,13 +11470,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11653,13 +11486,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11668,10 +11501,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11681,13 +11514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11697,13 +11530,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11713,13 +11546,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11729,13 +11562,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-1933"
+     "referenced_type" : "type-1904"
     }
    ],
-   "return_type" : "type-2553",
+   "return_type" : "type-2543",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11745,13 +11578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11761,13 +11594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11777,10 +11610,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11790,10 +11623,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11803,13 +11636,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11819,16 +11652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2072"
+     "referenced_type" : "type-2043"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11838,10 +11671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11851,13 +11684,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11867,13 +11700,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11883,10 +11716,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2556",
+   "return_type" : "type-2546",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11896,10 +11729,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2557",
+   "return_type" : "type-2547",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11909,13 +11742,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2558",
+   "return_type" : "type-2548",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11925,16 +11758,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2075"
+     "referenced_type" : "type-2047"
     }
    ],
-   "return_type" : "type-2559",
+   "return_type" : "type-2549",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11944,10 +11777,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2560",
+   "return_type" : "type-2550",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11957,13 +11790,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11973,13 +11806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11989,16 +11822,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2563",
+   "return_type" : "type-2553",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12008,13 +11841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2564",
+   "return_type" : "type-2554",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12024,13 +11857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2565",
+   "return_type" : "type-2555",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12040,13 +11873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-2566",
+   "return_type" : "type-2556",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12056,13 +11889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2567",
+   "return_type" : "type-2557",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12072,16 +11905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-2568",
+   "return_type" : "type-2558",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12091,13 +11924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-2570"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-2569",
+   "return_type" : "type-2559",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12107,10 +11940,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-2571",
+   "return_type" : "type-2561",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12120,13 +11953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2572",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12136,16 +11969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-2573",
+   "return_type" : "type-2563",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12155,13 +11988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-2575",
+   "return_type" : "type-2565",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12171,13 +12004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12187,13 +12020,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12203,16 +12036,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12222,19 +12055,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-2579"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-2578",
+   "return_type" : "type-2568",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12244,13 +12077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2581"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-2580",
+   "return_type" : "type-2570",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12260,13 +12093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2510"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12276,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-2582",
+   "return_type" : "type-2572",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12292,10 +12125,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12305,10 +12138,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12318,10 +12151,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12331,10 +12164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12344,10 +12177,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12357,13 +12190,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-2584",
+   "return_type" : "type-2574",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12373,13 +12206,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-2586",
+   "return_type" : "type-2576",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12389,13 +12222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-2588",
+   "return_type" : "type-2578",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12405,79 +12238,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-2589",
+   "return_type" : "type-2579",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12487,10 +12320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12500,10 +12333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12513,10 +12346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12526,20 +12359,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12549,7 +12382,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12558,7 +12391,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12568,26 +12401,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12597,16 +12430,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12616,16 +12449,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12635,19 +12468,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12657,19 +12490,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12679,13 +12512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1768"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12695,13 +12528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12711,16 +12544,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12730,7 +12563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12739,16 +12572,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,16 +12591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12777,22 +12610,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12802,13 +12635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12817,7 +12650,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12827,10 +12660,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12840,19 +12673,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12862,19 +12695,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12884,19 +12717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12906,13 +12739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12922,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12938,19 +12771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2593",
+   "return_type" : "type-2583",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,7 +12793,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12969,7 +12802,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2594",
+   "return_type" : "type-2584",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12979,25 +12812,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2595",
+   "return_type" : "type-2585",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13007,16 +12840,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2596",
+   "return_type" : "type-2586",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13026,16 +12859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-2597",
+   "return_type" : "type-2587",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13045,19 +12878,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2600"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-2599",
+   "return_type" : "type-2589",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13067,16 +12900,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2601",
+   "return_type" : "type-2591",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13086,13 +12919,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1788"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-2602",
+   "return_type" : "type-2592",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-2603",
+   "return_type" : "type-2593",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13118,16 +12951,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1783"
+     "referenced_type" : "type-1753"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2595"
     }
    ],
-   "return_type" : "type-2604",
+   "return_type" : "type-2594",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,19 +12970,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2607"
+     "referenced_type" : "type-2597"
     }
    ],
-   "return_type" : "type-2606",
+   "return_type" : "type-2596",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13159,16 +12992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2609"
+     "referenced_type" : "type-2599"
     }
    ],
-   "return_type" : "type-2608",
+   "return_type" : "type-2598",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,22 +13011,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2611"
+     "referenced_type" : "type-2601"
     }
    ],
-   "return_type" : "type-2610",
+   "return_type" : "type-2600",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13203,13 +13036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13218,7 +13051,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2612",
+   "return_type" : "type-2602",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13228,10 +13061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-2613",
+   "return_type" : "type-2603",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13241,19 +13074,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2615"
+     "referenced_type" : "type-2605"
     }
    ],
-   "return_type" : "type-2614",
+   "return_type" : "type-2604",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13263,16 +13096,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2616",
+   "return_type" : "type-2606",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13282,19 +13115,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-2618"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-2617",
+   "return_type" : "type-2607",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13304,13 +13137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13320,13 +13153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13337,10 +13170,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13351,10 +13184,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13364,10 +13211,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13376,7 +13223,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13386,16 +13233,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2088"
+     "referenced_type" : "type-2075"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13405,22 +13252,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2210"
+     "referenced_type" : "type-2184"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2185"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13430,13 +13277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13447,13 +13294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13464,13 +13311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13480,10 +13327,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13493,10 +13340,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13506,10 +13353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13519,10 +13366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13532,10 +13379,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13546,16 +13393,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13566,16 +13413,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13586,16 +13433,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13606,19 +13453,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13629,19 +13476,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13652,19 +13499,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13675,19 +13522,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13698,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13718,16 +13565,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13738,16 +13585,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13758,19 +13605,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13781,19 +13628,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13804,19 +13651,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13827,19 +13674,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13850,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13870,16 +13717,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13890,16 +13737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13910,19 +13757,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13933,19 +13780,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13956,19 +13803,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13979,19 +13826,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14002,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14022,16 +13869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14042,16 +13889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14062,19 +13909,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14085,19 +13932,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14108,19 +13955,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14131,19 +13978,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14154,16 +14001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14174,16 +14021,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14194,16 +14041,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14214,19 +14061,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14237,19 +14084,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14260,19 +14107,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14283,19 +14130,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14306,16 +14153,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14326,16 +14173,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14346,16 +14193,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14366,19 +14213,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14389,19 +14236,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14412,19 +14259,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14435,19 +14282,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14458,16 +14305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14478,16 +14325,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14498,16 +14345,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14518,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14541,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14564,19 +14411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14587,19 +14434,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14610,16 +14457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14630,16 +14477,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14650,16 +14497,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14670,19 +14517,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14693,19 +14540,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14716,19 +14563,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14739,19 +14586,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14762,16 +14609,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14782,16 +14629,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14802,16 +14649,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14822,19 +14669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14845,19 +14692,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14868,19 +14715,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14891,19 +14738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14914,16 +14761,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14934,16 +14781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14954,19 +14801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14977,19 +14824,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15000,19 +14847,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15023,19 +14870,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15046,16 +14893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15066,16 +14913,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15086,19 +14933,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15109,19 +14956,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15132,19 +14979,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15155,19 +15002,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15177,16 +15024,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15195,14 +15042,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15211,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15220,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15229,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15238,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15247,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15256,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3836",
+   "referenced_type" : "type-3808",
+   "self_type" : "type-3807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15265,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15274,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3037",
+   "self_type" : "type-3036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15283,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3843",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3814",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15292,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15301,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15310,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15319,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15328,8 +15169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15337,8 +15178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15346,8 +15187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15355,8 +15196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2910",
+   "self_type" : "type-2909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15364,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15373,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3314",
-   "self_type" : "type-3313",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15382,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15391,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3544",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15400,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3736",
-   "self_type" : "type-3735",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15409,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3940",
-   "self_type" : "type-3939",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15418,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4024",
-   "self_type" : "type-4023",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15427,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4194",
-   "self_type" : "type-4193",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15436,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4348",
-   "self_type" : "type-4347",
+   "referenced_type" : "type-4322",
+   "self_type" : "type-4321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15445,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15454,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4472",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15463,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15472,17 +15313,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2206",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15490,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15499,35 +15340,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2197",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15544,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15553,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15562,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15571,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15580,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15589,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15598,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15607,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15616,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15625,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2858",
-   "self_type" : "type-2857",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15634,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15643,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15652,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3312",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15661,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15670,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15679,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3679",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15688,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3752",
-   "self_type" : "type-3751",
+   "referenced_type" : "type-3725",
+   "self_type" : "type-3724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15697,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3915",
+   "self_type" : "type-3914",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15706,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4020",
-   "self_type" : "type-4019",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3992",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15715,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4183",
-   "self_type" : "type-4182",
+   "referenced_type" : "type-4161",
+   "self_type" : "type-4160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15724,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4304",
-   "self_type" : "type-4303",
+   "referenced_type" : "type-4278",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15733,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15742,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15751,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4594",
-   "self_type" : "type-4593",
+   "referenced_type" : "type-4568",
+   "self_type" : "type-4567",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15760,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15769,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15778,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15787,8 +15628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15796,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15805,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15814,8 +15655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15823,8 +15664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15832,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15841,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15850,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15859,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15868,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15877,8 +15718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15886,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15895,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15904,8 +15745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15913,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15922,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15931,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15949,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15958,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15967,8 +15808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15976,8 +15817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15985,8 +15826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15994,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16003,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -16012,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16021,8 +15862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16030,861 +15871,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2125",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3367",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3527",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3828",
-   "self_type" : "type-3830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4083",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4248",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4383",
-   "self_type" : "type-4385",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4522",
-   "self_type" : "type-4524",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4641",
-   "self_type" : "type-4643",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2205",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1976",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3037",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3355",
-   "self_type" : "type-3357",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3517",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3645",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3816",
-   "self_type" : "type-3818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4071",
-   "self_type" : "type-4073",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4238",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4324",
-   "self_type" : "type-4326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4511",
-   "self_type" : "type-4513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4631",
-   "self_type" : "type-4633",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1812",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3342",
-   "self_type" : "type-3344",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3503",
-   "self_type" : "type-3505",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3802",
-   "self_type" : "type-3804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4056",
-   "self_type" : "type-4058",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4224",
-   "self_type" : "type-4226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4367",
-   "self_type" : "type-4369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4496",
-   "self_type" : "type-4498",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4596",
-   "self_type" : "type-4598",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2057",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4165",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2089",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3006",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3329",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3490",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3786",
-   "self_type" : "type-3789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4042",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4357",
-   "self_type" : "type-4359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4609",
-   "self_type" : "type-4611",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16892,1025 +15878,44 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2075",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3027",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1956",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3349",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3810",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4062",
-   "self_type" : "type-4064",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4233",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4337",
-   "self_type" : "type-4339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4504",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4599",
-   "self_type" : "type-4601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2997",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3381",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4097",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4340",
-   "self_type" : "type-4342",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1933",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-4468",
-   "self_type" : "type-4470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-4330",
-   "self_type" : "type-4332",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1981",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3045",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3520",
-   "self_type" : "type-3522",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3825",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4078",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4241",
-   "self_type" : "type-4243",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4334",
-   "self_type" : "type-4336",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4636",
-   "self_type" : "type-4638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3350",
-   "self_type" : "type-3352",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3811",
-   "self_type" : "type-3813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4065",
-   "self_type" : "type-4067",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4197",
-   "self_type" : "type-4199",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4372",
-   "self_type" : "type-4375",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4505",
-   "self_type" : "type-4507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4626",
-   "self_type" : "type-4628",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1992",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3055",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3370",
-   "self_type" : "type-3372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3532",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3833",
-   "self_type" : "type-3835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4086",
-   "self_type" : "type-4088",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4253",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4390",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4529",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4648",
-   "self_type" : "type-4650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3016",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3500",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3797",
-   "self_type" : "type-3799",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4051",
-   "self_type" : "type-4053",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4221",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4343",
-   "self_type" : "type-4345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4490",
-   "self_type" : "type-4493",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4619",
-   "self_type" : "type-4621",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1796",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2085",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3324",
-   "self_type" : "type-3326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3487",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3785",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4206",
-   "self_type" : "type-4208",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4351",
-   "self_type" : "type-4353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4476",
-   "self_type" : "type-4478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4606",
-   "self_type" : "type-4608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-980",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1768",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1950",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
    "referenced_type" : "type-2092",
    "self_type" : "type-2094",
    "size" : 4,
@@ -17918,26 +15923,197 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3011",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3020",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3344",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4055",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4359",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4496",
+   "self_type" : "type-4498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4617",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2801",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3010",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
    "referenced_type" : "type-3332",
    "self_type" : "type-3334",
    "size" : 4,
@@ -17945,89 +16121,1124 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3493",
-   "self_type" : "type-3495",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3490",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3647",
-   "self_type" : "type-3649",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3794",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4045",
-   "self_type" : "type-4047",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4214",
-   "self_type" : "type-4216",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4327",
-   "self_type" : "type-4329",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4298",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4485",
-   "self_type" : "type-4487",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4614",
-   "self_type" : "type-4616",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4605",
+   "self_type" : "type-4607",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3480",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4028",
+   "self_type" : "type-4030",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4200",
+   "self_type" : "type-4202",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4341",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2240",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1915",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2979",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3465",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3759",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4187",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4329",
+   "self_type" : "type-4331",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4585",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1750",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1937",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3326",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3485",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4205",
+   "self_type" : "type-4207",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4311",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4479",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-980",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2970",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3354",
+   "self_type" : "type-3356",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3751",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4068",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4314",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1904",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4444",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-4304",
+   "self_type" : "type-4306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3013",
+   "self_type" : "type-3015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3339",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4050",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4219",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4308",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4612",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1940",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3329",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3455",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3783",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4039",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4177",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4347",
+   "self_type" : "type-4349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4602",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -18035,10 +17246,649 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3028",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3806",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4622",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1757",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1926",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2989",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4025",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4195",
+   "self_type" : "type-4197",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4319",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4468",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1767",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3303",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3754",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4009",
+   "self_type" : "type-4012",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4328",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4582",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1920",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2984",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3470",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3762",
+   "self_type" : "type-3764",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4020",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4190",
+   "self_type" : "type-4192",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4459",
+   "self_type" : "type-4461",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18046,8 +17896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2852",
+   "self_type" : "type-2854",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18055,8 +17905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3700",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18064,8 +17914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18073,8 +17923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18082,8 +17932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18091,8 +17941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18100,8 +17950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18109,8 +17959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18118,8 +17968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18127,8 +17977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18136,8 +17986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -18145,8 +17995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18154,8 +18004,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18163,8 +18013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18172,8 +18022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18181,8 +18031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18190,8 +18040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18199,8 +18049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -18208,8 +18058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18217,8 +18067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -18226,8 +18076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18235,8 +18085,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18244,8 +18094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18253,8 +18103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18262,8 +18112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18271,8 +18121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18280,8 +18130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18289,8 +18139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18298,8 +18148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18307,8 +18157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18316,8 +18166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18325,8 +18175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1928",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1900",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -18334,17 +18184,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-4464",
-   "self_type" : "type-4466",
+   "referenced_type" : "type-4438",
+   "self_type" : "type-4440",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3353",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18352,8 +18229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1938",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18361,8 +18238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18370,8 +18247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18379,8 +18256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18388,8 +18265,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18397,8 +18274,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18406,8 +18283,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-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18415,8 +18292,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-3207",
-   "self_type" : "type-3206",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18424,8 +18301,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-3320",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18433,8 +18310,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-3930",
-   "self_type" : "type-3929",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18442,8 +18319,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-4031",
-   "self_type" : "type-4030",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18451,8 +18328,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-4460",
-   "self_type" : "type-4459",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18460,8 +18337,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18469,8 +18346,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3622",
+   "self_type" : "type-3621",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18478,8 +18355,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18488,7 +18365,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18496,8 +18373,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -18508,8 +18385,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18517,8 +18394,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18526,8 +18403,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3697",
-   "self_type" : "type-3696",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18535,8 +18412,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4653",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18544,26 +18421,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18571,8 +18448,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18580,8 +18457,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18589,8 +18466,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18598,8 +18475,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18607,8 +18484,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18616,8 +18493,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18625,8 +18502,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18634,8 +18511,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2915",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18643,8 +18520,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18652,8 +18529,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18661,8 +18538,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18670,8 +18547,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18679,8 +18556,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3672",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18688,8 +18565,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18697,8 +18574,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18706,8 +18583,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18715,8 +18592,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18724,8 +18601,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4179",
-   "self_type" : "type-4178",
+   "referenced_type" : "type-4157",
+   "self_type" : "type-4156",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18733,8 +18610,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4302",
-   "self_type" : "type-4301",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4275",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18742,8 +18619,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18751,8 +18628,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4590",
-   "self_type" : "type-4589",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18760,8 +18637,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18769,8 +18646,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18778,8 +18655,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -18787,8 +18664,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18796,8 +18673,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18805,150 +18682,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -18956,35 +18689,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2185",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -18992,11 +18761,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -19004,7 +18881,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19012,8 +18889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19021,8 +18898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19030,8 +18907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19039,8 +18916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19048,8 +18925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19057,8 +18934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19066,8 +18943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2767",
-   "self_type" : "type-2766",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19075,8 +18952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19084,8 +18961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19093,8 +18970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3208",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19102,8 +18979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19111,8 +18988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3453",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19120,8 +18997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3621",
-   "self_type" : "type-3620",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19129,8 +19006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3671",
-   "self_type" : "type-3670",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19138,8 +19015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19147,8 +19024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19156,8 +19033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19165,8 +19042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4015",
-   "self_type" : "type-4014",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19174,8 +19051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4177",
-   "self_type" : "type-4176",
+   "referenced_type" : "type-4155",
+   "self_type" : "type-4154",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19183,8 +19060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4300",
-   "self_type" : "type-4299",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19192,8 +19069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4448",
-   "self_type" : "type-4447",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19201,8 +19078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4588",
-   "self_type" : "type-4587",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19210,8 +19087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19219,8 +19096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19228,8 +19105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19237,8 +19114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-3631",
-   "self_type" : "type-3630",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19246,8 +19123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4659",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19255,8 +19132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19264,8 +19141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19273,1995 +19150,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3418",
-   "self_type" : "type-3417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3722",
-   "self_type" : "type-3721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-4141",
-   "self_type" : "type-4140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3126",
-   "self_type" : "type-3125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3410",
-   "self_type" : "type-3409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3592",
-   "self_type" : "type-3591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3714",
-   "self_type" : "type-3713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3894",
-   "self_type" : "type-3893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4132",
-   "self_type" : "type-4131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4666",
-   "self_type" : "type-4665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3408",
-   "self_type" : "type-3407",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3712",
-   "self_type" : "type-3711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3892",
-   "self_type" : "type-3891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-4130",
-   "self_type" : "type-4129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1994",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2905",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3412",
-   "self_type" : "type-3411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3716",
-   "self_type" : "type-3715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3896",
-   "self_type" : "type-3895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-4135",
-   "self_type" : "type-4134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3406",
-   "self_type" : "type-3405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3754",
-   "self_type" : "type-3753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3964",
-   "self_type" : "type-3963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-4128",
-   "self_type" : "type-4127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3042",
-   "self_type" : "type-3041",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3389",
-   "self_type" : "type-3388",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3581",
-   "self_type" : "type-3580",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3966",
-   "self_type" : "type-3965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4107",
-   "self_type" : "type-4106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4277",
-   "self_type" : "type-4276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4414",
-   "self_type" : "type-4413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4550",
-   "self_type" : "type-4549",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2911",
-   "self_type" : "type-2910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3416",
-   "self_type" : "type-3415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3900",
-   "self_type" : "type-3899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-4139",
-   "self_type" : "type-4138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3265",
-   "self_type" : "type-3264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3390",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3575",
-   "self_type" : "type-3574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3968",
-   "self_type" : "type-3967",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4110",
-   "self_type" : "type-4109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4272",
-   "self_type" : "type-4271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4417",
-   "self_type" : "type-4416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4552",
-   "self_type" : "type-4551",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3219",
-   "self_type" : "type-3218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3316",
-   "self_type" : "type-3315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3738",
-   "self_type" : "type-3737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3942",
-   "self_type" : "type-3941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4026",
-   "self_type" : "type-4025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4196",
-   "self_type" : "type-4195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4350",
-   "self_type" : "type-4349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4456",
-   "self_type" : "type-4455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4475",
-   "self_type" : "type-4474",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4605",
-   "self_type" : "type-4604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3414",
-   "self_type" : "type-3413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3897",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-4137",
-   "self_type" : "type-4136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3396",
-   "self_type" : "type-3395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3768",
-   "self_type" : "type-3767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3890",
-   "self_type" : "type-3889",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4116",
-   "self_type" : "type-4115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3536",
-   "self_type" : "type-3535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3872",
-   "self_type" : "type-3871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3431",
-   "self_type" : "type-3430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3913",
-   "self_type" : "type-3912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4153",
-   "self_type" : "type-4152",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4269",
-   "self_type" : "type-4268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4433",
-   "self_type" : "type-4432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4569",
-   "self_type" : "type-4568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2126",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3528",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3832",
-   "self_type" : "type-3831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4250",
-   "self_type" : "type-4249",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4387",
-   "self_type" : "type-4386",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4526",
-   "self_type" : "type-4525",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4645",
-   "self_type" : "type-4644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2013",
-   "self_type" : "type-2012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3553",
-   "self_type" : "type-3552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4259",
-   "self_type" : "type-4258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4356",
-   "self_type" : "type-4355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4545",
-   "self_type" : "type-4544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4683",
-   "self_type" : "type-4682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3534",
-   "self_type" : "type-3533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3692",
-   "self_type" : "type-3691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4255",
-   "self_type" : "type-4254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4323",
-   "self_type" : "type-4322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -21269,224 +19157,89 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3108",
+   "self_type" : "type-3107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3113",
-   "self_type" : "type-3112",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3509",
-   "self_type" : "type-3508",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3551",
-   "self_type" : "type-3550",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3884",
-   "self_type" : "type-3883",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-4114",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4316",
-   "self_type" : "type-4315",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4406",
-   "self_type" : "type-4405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3102",
-   "self_type" : "type-3101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3875",
-   "self_type" : "type-3874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -21494,4949 +19247,35 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3105",
-   "self_type" : "type-3104",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3877",
-   "self_type" : "type-3876",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3957",
-   "self_type" : "type-3956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-4175",
-   "self_type" : "type-4174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3446",
-   "self_type" : "type-3445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3756",
-   "self_type" : "type-3755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4169",
-   "self_type" : "type-4168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4664",
-   "self_type" : "type-4663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2761",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3616",
-   "self_type" : "type-3615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3613",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3669",
-   "self_type" : "type-3668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3762",
-   "self_type" : "type-3761",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3758",
-   "self_type" : "type-3757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3955",
-   "self_type" : "type-3954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-4171",
-   "self_type" : "type-4170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3433",
-   "self_type" : "type-3432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3914",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4155",
-   "self_type" : "type-4154",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4285",
-   "self_type" : "type-4284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4431",
-   "self_type" : "type-4430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4567",
-   "self_type" : "type-4566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2159",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1822",
-   "self_type" : "type-1821",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3359",
-   "self_type" : "type-3358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3820",
-   "self_type" : "type-3819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4075",
-   "self_type" : "type-4074",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4240",
-   "self_type" : "type-4239",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4379",
-   "self_type" : "type-4378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4635",
-   "self_type" : "type-4634",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3022",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3346",
-   "self_type" : "type-3345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3506",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4059",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4227",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4371",
-   "self_type" : "type-4370",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4500",
-   "self_type" : "type-4499",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4625",
-   "self_type" : "type-4624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1755",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4203",
-   "self_type" : "type-4202",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4318",
-   "self_type" : "type-4317",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3429",
-   "self_type" : "type-3428",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4151",
-   "self_type" : "type-4150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4266",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4728",
-   "self_type" : "type-4727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2711",
-   "self_type" : "type-2710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3184",
-   "self_type" : "type-3183",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3540",
-   "self_type" : "type-3539",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3602",
-   "self_type" : "type-3601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3731",
-   "self_type" : "type-3730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3920",
-   "self_type" : "type-3919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3949",
-   "self_type" : "type-3948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4004",
-   "self_type" : "type-4003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4159",
-   "self_type" : "type-4158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4289",
-   "self_type" : "type-4288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4439",
-   "self_type" : "type-4438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2305",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2295",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2076",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2063",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3865",
-   "self_type" : "type-3864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-2088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2889",
-   "self_type" : "type-2888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3085",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3400",
-   "self_type" : "type-3399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3565",
-   "self_type" : "type-3564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3863",
-   "self_type" : "type-3862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4120",
-   "self_type" : "type-4119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4398",
-   "self_type" : "type-4397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4424",
-   "self_type" : "type-4423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4559",
-   "self_type" : "type-4558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4707",
-   "self_type" : "type-4706",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2503",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3398",
-   "self_type" : "type-3397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3563",
-   "self_type" : "type-3562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3858",
-   "self_type" : "type-3857",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3974",
-   "self_type" : "type-3973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4118",
-   "self_type" : "type-4117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4396",
-   "self_type" : "type-4395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4557",
-   "self_type" : "type-4556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1880",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3586",
-   "self_type" : "type-3585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3708",
-   "self_type" : "type-3707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3870",
-   "self_type" : "type-3869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3982",
-   "self_type" : "type-3981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4283",
-   "self_type" : "type-4282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4428",
-   "self_type" : "type-4427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4563",
-   "self_type" : "type-4562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3275",
-   "self_type" : "type-3274",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3402",
-   "self_type" : "type-3401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3583",
-   "self_type" : "type-3582",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3706",
-   "self_type" : "type-3705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3868",
-   "self_type" : "type-3867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3979",
-   "self_type" : "type-3978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4123",
-   "self_type" : "type-4122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4281",
-   "self_type" : "type-4280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4426",
-   "self_type" : "type-4425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3070",
-   "self_type" : "type-3069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3377",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3435",
-   "self_type" : "type-3434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3675",
-   "self_type" : "type-3674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3850",
-   "self_type" : "type-3849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4093",
-   "self_type" : "type-4092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4157",
-   "self_type" : "type-4156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4279",
-   "self_type" : "type-4278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4532",
-   "self_type" : "type-4531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4536",
-   "self_type" : "type-4535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3017",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3801",
-   "self_type" : "type-3800",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4223",
-   "self_type" : "type-4222",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4365",
-   "self_type" : "type-4364",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4495",
-   "self_type" : "type-4494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4623",
-   "self_type" : "type-4622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3354",
-   "self_type" : "type-3353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3815",
-   "self_type" : "type-3814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4069",
-   "self_type" : "type-4068",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4235",
-   "self_type" : "type-4234",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4377",
-   "self_type" : "type-4376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4509",
-   "self_type" : "type-4508",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4630",
-   "self_type" : "type-4629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3141",
-   "self_type" : "type-3140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3470",
-   "self_type" : "type-3469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3567",
-   "self_type" : "type-3566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4192",
-   "self_type" : "type-4191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4261",
-   "self_type" : "type-4260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4435",
-   "self_type" : "type-4434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4571",
-   "self_type" : "type-4570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4712",
-   "self_type" : "type-4711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3145",
-   "self_type" : "type-3144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3427",
-   "self_type" : "type-3426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3909",
-   "self_type" : "type-3908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3996",
-   "self_type" : "type-3995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4149",
-   "self_type" : "type-4148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4265",
-   "self_type" : "type-4264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4437",
-   "self_type" : "type-4436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1823",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3046",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3364",
-   "self_type" : "type-3363",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3524",
-   "self_type" : "type-3523",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3827",
-   "self_type" : "type-3826",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4245",
-   "self_type" : "type-4244",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4381",
-   "self_type" : "type-4380",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4520",
-   "self_type" : "type-4519",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4640",
-   "self_type" : "type-4639",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1740",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2916",
-   "self_type" : "type-2915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3279",
-   "self_type" : "type-3278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3686",
-   "self_type" : "type-3685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3724",
-   "self_type" : "type-3723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3879",
-   "self_type" : "type-3878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4181",
-   "self_type" : "type-4180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4298",
-   "self_type" : "type-4297",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4308",
-   "self_type" : "type-4307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4402",
-   "self_type" : "type-4401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4543",
-   "self_type" : "type-4542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1854",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2036",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3109",
-   "self_type" : "type-3108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3690",
-   "self_type" : "type-3689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3727",
-   "self_type" : "type-3726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4187",
-   "self_type" : "type-4186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4311",
-   "self_type" : "type-4310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4404",
-   "self_type" : "type-4403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4565",
-   "self_type" : "type-4564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4647",
-   "self_type" : "type-4646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3425",
-   "self_type" : "type-3424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3994",
-   "self_type" : "type-3993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4147",
-   "self_type" : "type-4146",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4263",
-   "self_type" : "type-4262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4409",
-   "self_type" : "type-4408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4717",
-   "self_type" : "type-4716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3998",
-   "self_type" : "type-3997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3007",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4044",
-   "self_type" : "type-4043",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4213",
-   "self_type" : "type-4212",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4361",
-   "self_type" : "type-4360",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4483",
-   "self_type" : "type-4482",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4613",
-   "self_type" : "type-4612",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-1759",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-4185",
-   "self_type" : "type-4184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-4143",
-   "self_type" : "type-4142",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-1930",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1999",
-   "self_type" : "type-1998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3159",
-   "self_type" : "type-3158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3383",
-   "self_type" : "type-3382",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3444",
-   "self_type" : "type-3443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3681",
-   "self_type" : "type-3680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3772",
-   "self_type" : "type-3771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3959",
-   "self_type" : "type-3958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4534",
-   "self_type" : "type-4533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4539",
-   "self_type" : "type-4538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1848",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3385",
-   "self_type" : "type-3384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3450",
-   "self_type" : "type-3449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3684",
-   "self_type" : "type-3683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3856",
-   "self_type" : "type-3855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4102",
-   "self_type" : "type-4101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4173",
-   "self_type" : "type-4172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4400",
-   "self_type" : "type-4399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4541",
-   "self_type" : "type-4540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-3387",
    "self_type" : "type-3386",
    "size" : 4,
@@ -26444,296 +19283,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3558",
-   "self_type" : "type-3557",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4104",
-   "self_type" : "type-4103",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4145",
-   "self_type" : "type-4144",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4394",
-   "self_type" : "type-4393",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4412",
-   "self_type" : "type-4411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4548",
-   "self_type" : "type-4547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1842",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3012",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3336",
-   "self_type" : "type-3335",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3497",
-   "self_type" : "type-3496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4049",
-   "self_type" : "type-4048",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4217",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4363",
-   "self_type" : "type-4362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4489",
-   "self_type" : "type-4488",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4618",
-   "self_type" : "type-4617",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -26741,10 +19346,7282 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3097",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3385",
+   "self_type" : "type-3384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-4104",
+   "self_type" : "type-4103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-4108",
+   "self_type" : "type-4107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3934",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-4102",
+   "self_type" : "type-4101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3366",
+   "self_type" : "type-3365",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4390",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4174",
+   "self_type" : "type-4173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4324",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-4110",
+   "self_type" : "type-4109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2953",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3095",
+   "self_type" : "type-3094",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4128",
+   "self_type" : "type-4127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4226",
+   "self_type" : "type-4225",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4361",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4235",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4520",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3085",
+   "self_type" : "type-3084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4381",
+   "self_type" : "type-4380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-4149",
+   "self_type" : "type-4148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3958",
+   "self_type" : "type-3957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4352",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4032",
+   "self_type" : "type-4031",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4204",
+   "self_type" : "type-4203",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4342",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2907",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3414",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3703",
+   "self_type" : "type-3702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4137",
+   "self_type" : "type-4136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2864",
+   "self_type" : "type-2863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3945",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4397",
+   "self_type" : "type-4396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3944",
+   "self_type" : "type-3943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4370",
+   "self_type" : "type-4369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4258",
+   "self_type" : "type-4257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3948",
+   "self_type" : "type-3947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4400",
+   "self_type" : "type-4399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4135",
+   "self_type" : "type-4134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4506",
+   "self_type" : "type-4505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2990",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4027",
+   "self_type" : "type-4026",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4199",
+   "self_type" : "type-4198",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4469",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1941",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4484",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3260",
+   "self_type" : "type-3259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4170",
+   "self_type" : "type-4169",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4546",
+   "self_type" : "type-4545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4686",
+   "self_type" : "type-4685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4241",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4355",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4494",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4284",
+   "self_type" : "type-4283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4376",
+   "self_type" : "type-4375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1719",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4586",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-1730",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-4163",
+   "self_type" : "type-4162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4115",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-1901",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2785",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3930",
+   "self_type" : "type-3929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4513",
+   "self_type" : "type-4512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3362",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3426",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4075",
+   "self_type" : "type-4074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4151",
+   "self_type" : "type-4150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4374",
+   "self_type" : "type-4373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4119",
+   "self_type" : "type-4118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4022",
+   "self_type" : "type-4021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4194",
+   "self_type" : "type-4193",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4335",
+   "self_type" : "type-4334",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26752,8 +26629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26761,8 +26638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26770,8 +26647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26779,8 +26656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26788,96 +26665,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -26885,10 +26672,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26896,8 +26773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26905,8 +26782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26914,8 +26791,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-2508",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26923,8 +26800,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-2501",
-   "self_type" : "type-2505",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26932,8 +26809,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26941,8 +26818,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26950,8 +26827,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26959,8 +26836,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26968,8 +26845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-2502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26977,8 +26854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26986,8 +26863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26995,8 +26872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-938",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27004,8 +26881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27013,8 +26890,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27022,8 +26899,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27031,8 +26908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27049,8 +26926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27058,8 +26935,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27067,8 +26944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -27076,8 +26953,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27085,8 +26962,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27094,8 +26971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2210",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -27103,8 +26980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27112,8 +26989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -27121,8 +26998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -27130,8 +27007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -27139,8 +27016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -27148,8 +27025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -27157,8 +27034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27166,8 +27043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27175,8 +27052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27184,8 +27061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27193,8 +27070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27202,8 +27079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -27211,8 +27088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27220,8 +27097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3060",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27229,8 +27106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3838",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-3809",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27238,8 +27115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27247,8 +27124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27256,8 +27133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27265,8 +27142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27274,8 +27151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27283,8 +27160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27292,8 +27169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2640",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27301,8 +27178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3066",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27310,8 +27187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27319,8 +27196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3394",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27328,8 +27205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3576",
-   "self_type" : "type-3579",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27337,8 +27214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3845",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3970",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27355,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4111",
-   "self_type" : "type-4113",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27364,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-44",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27373,8 +27250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4273",
-   "self_type" : "type-4275",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27382,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4418",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27391,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4555",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27400,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemory *",
    "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27409,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemoryHeap *",
    "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -27418,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27427,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3554",
-   "self_type" : "type-3556",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27445,8 +27322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27454,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27463,8 +27340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27472,8 +27349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27481,8 +27358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27490,8 +27367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27499,8 +27376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27508,8 +27385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27517,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27526,26 +27403,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2204",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2199",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27553,8 +27430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27562,8 +27439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27571,8 +27448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27580,8 +27457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27589,8 +27466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27598,8 +27475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27607,8 +27484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27616,8 +27493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27625,8 +27502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27634,8 +27511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27643,8 +27520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27652,8 +27529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27661,8 +27538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27670,8 +27547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27679,8 +27556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27688,8 +27565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27697,8 +27574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2054",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27706,8 +27583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27715,8 +27592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27724,8 +27601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3199",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27733,8 +27610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27742,8 +27619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3302",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27751,8 +27628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27760,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3605",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27769,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27778,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3925",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27787,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4009",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27796,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4162",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27805,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4293",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27814,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4441",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27823,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4582",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27832,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27841,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27850,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27859,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27868,8 +27745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27877,8 +27754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27886,8 +27763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27895,8 +27772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27904,8 +27781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27913,8 +27790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27922,8 +27799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27931,8 +27808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27940,8 +27817,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27949,8 +27826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27958,8 +27835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27967,8 +27844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27976,8 +27853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27985,8 +27862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27994,8 +27871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28003,8 +27880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28012,8 +27889,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -28021,8 +27898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2243",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -28030,8 +27907,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28039,8 +27916,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-3082",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28048,8 +27925,35 @@
    "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-3859",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3968",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28057,8 +27961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28066,8 +27970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3443",
+   "self_type" : "type-3445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28075,8 +27979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4188",
-   "self_type" : "type-4190",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28084,8 +27988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28093,8 +27997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28102,8 +28006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3852",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28111,8 +28015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28120,8 +28024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3559",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28129,8 +28033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28138,8 +28042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28147,8 +28051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28156,8 +28060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28165,8 +28069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28174,8 +28078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28183,8 +28087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28192,8 +28096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28201,8 +28105,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28210,8 +28114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28219,8 +28123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28228,8 +28132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28237,8 +28141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28246,141 +28150,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
-   "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXNode> *",
-   "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
-   "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
-   "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::NativeHandle> *",
-   "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "referenced_type" : "type-2521",
    "self_type" : "type-2523",
    "size" : 4,
@@ -28388,10 +28157,145 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
+   "name" : "const android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXNode> *",
+   "name" : "const android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
+   "name" : "const android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
+   "name" : "const android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28399,8 +28303,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28408,8 +28312,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28417,8 +28321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-937",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28426,8 +28330,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28435,8 +28339,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28444,8 +28348,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-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28453,8 +28357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28462,8 +28366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28471,8 +28375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28480,26 +28384,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28507,8 +28402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28516,8 +28411,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28525,8 +28420,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28534,8 +28429,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28543,8 +28438,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28552,8 +28447,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-1923",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28561,8 +28456,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-3210",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3187",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28570,8 +28465,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-3321",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-3298",
+   "self_type" : "type-3300",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28579,8 +28474,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-3934",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3908",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28588,8 +28483,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-4032",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28597,8 +28492,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-4461",
-   "self_type" : "type-4463",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28606,8 +28501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28615,8 +28510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28624,8 +28519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28633,8 +28528,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28642,8 +28537,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -28651,8 +28546,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28660,8 +28555,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28669,8 +28564,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28678,8 +28573,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28687,8 +28582,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -28697,7 +28592,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -28706,7 +28601,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28714,8 +28609,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28723,8 +28618,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28732,8 +28627,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -28741,8 +28636,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -28754,8 +28649,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28764,8 +28659,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28774,8 +28669,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -28784,8 +28679,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28794,8 +28689,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28804,8 +28699,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28814,8 +28709,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28824,8 +28719,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28834,8 +28729,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28844,8 +28739,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1898",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28854,8 +28749,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28864,8 +28759,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28874,8 +28769,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28884,8 +28779,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28894,8 +28789,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28904,8 +28799,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2931",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-3155",
+   "self_type" : "type-3159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28914,8 +28809,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28924,8 +28819,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3298",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28934,8 +28829,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3436",
-   "self_type" : "type-3438",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28944,8 +28839,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28954,8 +28849,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3603",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28964,8 +28859,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3661",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28974,8 +28869,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3730",
-   "self_type" : "type-3733",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28984,8 +28879,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3919",
-   "self_type" : "type-3921",
+   "referenced_type" : "type-3925",
+   "self_type" : "type-3924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28994,8 +28889,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-3947",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29004,8 +28899,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4003",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4136",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29014,8 +28909,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4158",
-   "self_type" : "type-4160",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29024,8 +28919,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4288",
-   "self_type" : "type-4290",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29034,8 +28929,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4438",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29044,8 +28939,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4577",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29054,8 +28949,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29064,8 +28959,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29074,8 +28969,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2183",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -29084,8 +28979,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29094,8 +28989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2314",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -29104,8 +28999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -29114,8 +29009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-69",
+   "self_type" : "type-2442",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -29124,8 +29019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29134,8 +29029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2188",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29144,8 +29039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29154,8 +29049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29164,8 +29059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29174,8 +29069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29184,8 +29079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1875",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29194,8 +29089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -29204,8 +29099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29214,8 +29109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29224,8 +29119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29234,8 +29129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29244,8 +29139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3058",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29254,8 +29149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3810",
+   "self_type" : "type-3809",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29264,8 +29159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29284,8 +29179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29294,8 +29189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29304,8 +29199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29314,8 +29209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29324,8 +29219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29334,8 +29229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2617",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29344,8 +29239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29354,8 +29249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3393",
-   "self_type" : "type-3392",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29374,8 +29269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3846",
-   "self_type" : "type-3845",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29384,8 +29279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3817",
+   "self_type" : "type-3816",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29394,8 +29289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4111",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29404,8 +29299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4274",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29414,8 +29309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29424,8 +29319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29434,8 +29329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4554",
-   "self_type" : "type-4553",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29444,8 +29339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29454,8 +29349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -29464,8 +29359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29474,8 +29369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29484,8 +29379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29494,8 +29389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29504,8 +29399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29514,8 +29409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29524,8 +29419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29534,8 +29429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3366",
-   "self_type" : "type-3365",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29544,8 +29439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3526",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29554,8 +29449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3829",
-   "self_type" : "type-3828",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29564,8 +29459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4082",
-   "self_type" : "type-4081",
+   "referenced_type" : "type-4054",
+   "self_type" : "type-4053",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29574,8 +29469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4246",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29584,8 +29479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4384",
-   "self_type" : "type-4383",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29594,8 +29489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4496",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29604,8 +29499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29614,8 +29509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-2486",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2461",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29624,8 +29519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3555",
-   "self_type" : "type-3554",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4664",
+   "self_type" : "type-4663",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29644,8 +29539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29654,8 +29549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29664,8 +29559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2167",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29674,8 +29569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29684,8 +29579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29694,8 +29589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29704,8 +29599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29714,8 +29609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29724,8 +29619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -29734,29 +29629,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2198",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2172",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -29764,8 +29659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29774,8 +29669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29784,8 +29679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29794,8 +29689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29804,8 +29699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29814,8 +29709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29824,8 +29719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -29834,8 +29729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29844,8 +29739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29854,8 +29749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29864,18 +29759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1731",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29884,8 +29769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29894,8 +29779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29904,8 +29789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2799",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29914,8 +29799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3035",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29924,8 +29809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29934,8 +29819,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29944,8 +29829,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29954,8 +29839,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3817",
-   "self_type" : "type-3816",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29964,8 +29849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4072",
-   "self_type" : "type-4071",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29974,8 +29859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4237",
-   "self_type" : "type-4236",
+   "referenced_type" : "type-4211",
+   "self_type" : "type-4210",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29984,8 +29869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4325",
-   "self_type" : "type-4324",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29994,8 +29879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30004,8 +29889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4606",
+   "self_type" : "type-4605",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30014,18 +29899,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30034,8 +29929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30044,8 +29939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30054,8 +29949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30064,18 +29959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30084,8 +29969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30094,8 +29979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30104,8 +29989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30114,8 +29999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3802",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30124,8 +30009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4057",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4029",
+   "self_type" : "type-4028",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30134,8 +30019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4201",
+   "self_type" : "type-4200",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30144,8 +30029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4368",
-   "self_type" : "type-4367",
+   "referenced_type" : "type-4340",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30154,8 +30039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4497",
-   "self_type" : "type-4496",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30164,18 +30049,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2169",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-2536",
+   "referenced_type" : "type-825",
+   "self_type" : "type-2512",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30184,8 +30089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30194,8 +30099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30204,8 +30109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30214,8 +30119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30224,8 +30129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -30234,8 +30139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30244,8 +30149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30254,8 +30159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30264,8 +30169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30274,8 +30179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30284,8 +30189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30294,8 +30199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2744",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30304,8 +30209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30314,8 +30219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30324,8 +30229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30334,8 +30239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3304",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30344,8 +30249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3440",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30354,8 +30259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3607",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30364,8 +30269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3748",
-   "self_type" : "type-3747",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30374,8 +30279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3927",
-   "self_type" : "type-3926",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3897",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30384,8 +30289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30394,8 +30299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4164",
-   "self_type" : "type-4163",
+   "referenced_type" : "type-4141",
+   "self_type" : "type-4140",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30404,8 +30309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30414,8 +30319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4443",
-   "self_type" : "type-4442",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30424,8 +30329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4584",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30434,8 +30339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30444,8 +30349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30454,8 +30359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30464,8 +30369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30474,8 +30379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30484,8 +30389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30494,8 +30399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2053",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30504,8 +30409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30514,8 +30419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2040",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30524,8 +30429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30534,8 +30439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30544,8 +30449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30554,8 +30459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30564,8 +30469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30574,8 +30479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30584,8 +30489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30594,8 +30499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30604,8 +30509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30614,8 +30519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-272",
+   "self_type" : "type-2024",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30624,8 +30529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30634,8 +30539,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30644,8 +30549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2239",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -30654,8 +30559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30664,8 +30569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30674,8 +30579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30684,8 +30589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30694,8 +30599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30704,8 +30609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30714,8 +30619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3305",
+   "self_type" : "type-3304",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30724,8 +30629,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30734,8 +30639,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3758",
+   "self_type" : "type-3757",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30744,8 +30649,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4039",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30754,8 +30659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4210",
-   "self_type" : "type-4209",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30764,8 +30669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4358",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4330",
+   "self_type" : "type-4329",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30774,8 +30679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4480",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30784,8 +30689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4610",
-   "self_type" : "type-4609",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30794,8 +30699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30804,8 +30709,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30814,8 +30719,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-3083",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30824,8 +30729,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-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30834,8 +30739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30844,8 +30749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30854,18 +30759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1748",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -30874,8 +30769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30884,8 +30779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30894,8 +30789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30904,8 +30799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30914,8 +30809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3511",
-   "self_type" : "type-3510",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30924,118 +30819,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3809",
-   "self_type" : "type-3808",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4063",
-   "self_type" : "type-4062",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4232",
-   "self_type" : "type-4231",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4338",
-   "self_type" : "type-4337",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2995",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-3380",
-   "self_type" : "type-3379",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-3779",
    "self_type" : "type-3778",
    "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4034",
+   "self_type" : "type-4033",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4206",
+   "self_type" : "type-4205",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4311",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4573",
+   "self_type" : "type-4572",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4096",
-   "self_type" : "type-4095",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -31044,8 +30899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4341",
-   "self_type" : "type-4340",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1751",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31054,8 +30909,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3750",
+   "self_type" : "type-3749",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4314",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -31064,8 +30969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31074,8 +30979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-4469",
-   "self_type" : "type-4468",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31084,8 +30989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31094,8 +30999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-4331",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31104,8 +31009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31114,8 +31019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31124,8 +31029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31134,8 +31039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31144,8 +31049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31154,8 +31059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31164,8 +31069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31174,478 +31079,448 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3361",
-   "self_type" : "type-3360",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3520",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3824",
-   "self_type" : "type-3823",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4076",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4241",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4335",
-   "self_type" : "type-4334",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4517",
-   "self_type" : "type-4516",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4637",
-   "self_type" : "type-4636",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3030",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3351",
-   "self_type" : "type-3350",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3477",
-   "self_type" : "type-3476",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3812",
-   "self_type" : "type-3811",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4198",
-   "self_type" : "type-4197",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4373",
-   "self_type" : "type-4372",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4506",
-   "self_type" : "type-4505",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4627",
-   "self_type" : "type-4626",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3370",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3834",
-   "self_type" : "type-3833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4252",
-   "self_type" : "type-4251",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4389",
-   "self_type" : "type-4388",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4528",
-   "self_type" : "type-4527",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4649",
-   "self_type" : "type-4648",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-4189",
-   "self_type" : "type-4188",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3014",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
    "referenced_type" : "type-3338",
    "self_type" : "type-3337",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4049",
+   "self_type" : "type-4048",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4217",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3002",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4037",
+   "self_type" : "type-4036",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4347",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4481",
+   "self_type" : "type-4480",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3505",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4362",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3443",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-4167",
+   "self_type" : "type-4166",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31654,8 +31529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3498",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31664,38 +31539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3797",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4052",
-   "self_type" : "type-4051",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4220",
-   "self_type" : "type-4219",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4344",
-   "self_type" : "type-4343",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1755",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31704,8 +31549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4491",
-   "self_type" : "type-4490",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31714,8 +31559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4620",
-   "self_type" : "type-4619",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31724,8 +31569,98 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2987",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4024",
+   "self_type" : "type-4023",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4196",
+   "self_type" : "type-4195",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4317",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4467",
+   "self_type" : "type-4466",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4594",
+   "self_type" : "type-4593",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31734,8 +31669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31744,8 +31679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31754,8 +31689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31764,8 +31699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31774,8 +31709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31784,8 +31719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31794,8 +31729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3301",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31804,8 +31739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31814,8 +31749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3784",
-   "self_type" : "type-3783",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31824,8 +31759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4037",
-   "self_type" : "type-4036",
+   "referenced_type" : "type-4010",
+   "self_type" : "type-4009",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31834,8 +31769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31844,8 +31779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4352",
-   "self_type" : "type-4351",
+   "referenced_type" : "type-4327",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31854,8 +31789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4476",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31864,8 +31799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4607",
-   "self_type" : "type-4606",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31874,8 +31809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31884,8 +31819,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31894,8 +31829,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-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3047",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31904,8 +31839,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31914,8 +31849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31924,8 +31859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31934,8 +31869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4698",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31944,8 +31879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31954,8 +31889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1795",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31964,8 +31899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31974,8 +31909,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1777",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31984,8 +31919,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31994,8 +31929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32004,8 +31939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32014,8 +31949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32024,8 +31959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32034,8 +31969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32044,8 +31979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1735",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32054,8 +31989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32064,8 +31999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32074,8 +32009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32084,8 +32019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2982",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32094,8 +32029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32104,8 +32039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32114,8 +32049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3648",
-   "self_type" : "type-3647",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32124,8 +32059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32134,8 +32069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4045",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32144,8 +32079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4215",
-   "self_type" : "type-4214",
+   "referenced_type" : "type-4191",
+   "self_type" : "type-4190",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32154,8 +32089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4327",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32164,8 +32099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32174,8 +32109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4589",
+   "self_type" : "type-4588",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32184,8 +32119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32194,8 +32129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32203,24 +32138,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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-3699",
-   "self_type" : "type-3698",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3669",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32228,18 +32155,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2305",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32248,8 +32183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32258,8 +32193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32268,8 +32203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32278,8 +32213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32288,8 +32223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32298,8 +32233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32308,8 +32243,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32318,8 +32253,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32328,8 +32263,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32338,8 +32273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32348,8 +32283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32358,8 +32293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32368,8 +32303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32378,8 +32313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32388,8 +32323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32398,8 +32333,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-2508",
-   "self_type" : "type-2514",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32408,8 +32343,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-2501",
-   "self_type" : "type-2506",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32418,8 +32353,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32428,8 +32363,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32438,8 +32373,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32448,8 +32383,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32458,8 +32393,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32468,8 +32403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32478,8 +32413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32488,8 +32423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32498,8 +32433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32508,8 +32443,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32518,8 +32453,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-566",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32528,8 +32463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32538,8 +32473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32548,8 +32483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32558,8 +32493,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32568,8 +32503,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -32578,28 +32513,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2191",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -32608,8 +32533,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32618,8 +32543,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32628,8 +32553,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32638,8 +32563,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -32648,8 +32573,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32658,8 +32583,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2297",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -32668,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1883",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32678,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32688,8 +32613,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32698,8 +32623,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32708,8 +32633,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-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32718,8 +32643,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-3211",
-   "self_type" : "type-3210",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32728,8 +32653,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-3322",
-   "self_type" : "type-3321",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32738,8 +32663,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-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32748,8 +32673,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-4033",
-   "self_type" : "type-4032",
+   "referenced_type" : "type-4007",
+   "self_type" : "type-4006",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32758,8 +32683,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-4462",
-   "self_type" : "type-4461",
+   "referenced_type" : "type-4436",
+   "self_type" : "type-4435",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32768,8 +32693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-1927",
-   "self_type" : "type-1926",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32778,8 +32703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-4465",
-   "self_type" : "type-4464",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32788,8 +32713,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32798,8 +32723,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32808,8 +32733,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-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32818,8 +32743,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-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32828,8 +32753,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-3318",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32838,8 +32763,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-3924",
-   "self_type" : "type-3923",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32848,8 +32773,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-4029",
-   "self_type" : "type-4028",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4001",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32858,18 +32783,48 @@
    "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-4458",
-   "self_type" : "type-4457",
+   "referenced_type" : "type-4432",
+   "self_type" : "type-4431",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3351",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32879,7 +32834,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32888,8 +32843,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32898,8 +32853,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1888",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32907,8 +32862,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -32916,8 +32871,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -32945,13 +32900,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2101",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -32977,18 +32932,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2141",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -33019,18 +32974,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2152",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -33061,23 +33016,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -33103,17 +33058,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -33123,13 +33078,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -33155,13 +33110,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2234"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -33187,28 +33142,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -33234,13 +33189,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -33266,17 +33221,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -33296,12 +33251,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -33326,8 +33281,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1686",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -33358,13 +33313,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -33400,13 +33355,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "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_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -33457,8 +33412,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -33489,12 +33444,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -33504,8 +33459,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -33531,7 +33486,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -33546,7 +33501,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -33561,13 +33516,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1784"
+     "referenced_type" : "type-1765"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -33593,13 +33548,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2141",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -33625,13 +33580,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -33657,47 +33612,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -33712,13 +33667,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2230",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -33744,12 +33699,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2197"
     },
     {
      "field_name" : "nStereoWidening",
@@ -33759,8 +33714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -33786,18 +33741,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -33823,18 +33778,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2010",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -33895,23 +33850,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2230"
+     "referenced_type" : "type-2205"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2229"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -33952,8 +33907,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -33989,23 +33944,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2251"
+     "referenced_type" : "type-2226"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2252"
+     "referenced_type" : "type-2227"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2225"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -34036,12 +33991,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34056,23 +34011,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -34113,8 +34068,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -34145,28 +34100,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2243"
+     "referenced_type" : "type-2218"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -34197,13 +34152,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2245"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -34234,18 +34189,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -34271,18 +34226,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -34308,18 +34263,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -34345,18 +34300,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -34392,23 +34347,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -34439,23 +34394,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -34501,18 +34456,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2227"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -34543,17 +34498,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -34568,18 +34523,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2196"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2200"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -34610,18 +34565,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -34652,18 +34607,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -34694,18 +34649,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -34736,13 +34691,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -34773,7 +34728,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34788,8 +34743,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -34825,7 +34780,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34840,8 +34795,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -34902,13 +34857,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -34964,23 +34919,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2240"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -35011,12 +34966,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -35031,23 +34986,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -35078,18 +35033,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -35120,18 +35075,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -35187,23 +35142,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -35229,7 +35184,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -35239,12 +35194,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2234"
+     "referenced_type" : "type-2210"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2211"
     },
     {
      "field_name" : "nSamplingRate",
@@ -35254,12 +35209,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -35269,8 +35224,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -35281,28 +35236,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -35313,23 +35268,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -35355,8 +35310,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -35377,7 +35332,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -35397,32 +35352,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -35432,7 +35387,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -35452,8 +35407,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -35464,23 +35419,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -35491,18 +35446,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -35523,108 +35478,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -35650,12 +35605,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -35670,13 +35625,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2275"
+     "referenced_type" : "type-2250"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -35687,27 +35642,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2273"
+     "referenced_type" : "type-2248"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -35718,23 +35673,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -35770,8 +35725,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2492",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -35792,13 +35747,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -35829,8 +35784,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -35856,12 +35811,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -35871,8 +35826,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -35903,13 +35858,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2339"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -35935,18 +35890,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2283"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2264"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -35972,7 +35927,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -35987,8 +35942,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -36024,8 +35979,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -36046,7 +36001,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36061,8 +36016,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -36083,7 +36038,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36103,18 +36058,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -36140,13 +36095,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -36172,13 +36127,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -36204,13 +36159,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -36236,12 +36191,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -36251,7 +36206,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -36261,7 +36216,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -36271,13 +36226,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -36303,53 +36258,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -36380,8 +36335,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -36407,13 +36362,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2394",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -36439,13 +36394,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2480",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -36471,13 +36426,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2292"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -36503,13 +36458,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -36535,13 +36490,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -36572,13 +36527,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -36604,13 +36559,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -36631,7 +36586,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36646,8 +36601,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -36668,7 +36623,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36683,12 +36638,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -36698,17 +36653,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -36723,13 +36678,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -36755,13 +36710,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2355"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -36797,8 +36752,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -36824,18 +36779,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -36861,12 +36816,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -36881,8 +36836,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -36908,13 +36863,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -36940,13 +36895,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2512",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2490",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -36972,18 +36927,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -37009,13 +36964,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2530"
+     "referenced_type" : "type-2506"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2507",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -37041,13 +36996,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2407"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -37083,8 +37038,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -37110,7 +37065,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -37125,8 +37080,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -37152,13 +37107,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -37184,23 +37139,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -37231,18 +37186,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -37273,8 +37228,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -37300,18 +37255,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -37322,12 +37277,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -37342,7 +37297,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -37352,28 +37307,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -37384,18 +37339,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -37421,13 +37376,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -37448,13 +37403,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -37475,8 +37430,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -37502,7 +37457,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2164"
+     "referenced_type" : "type-2136"
     },
     {
      "field_name" : "nDataSize",
@@ -37512,13 +37467,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -37549,13 +37504,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -37566,13 +37521,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -37598,13 +37553,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -37625,13 +37580,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -37652,13 +37607,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -37679,13 +37634,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -37748,13 +37703,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -37780,58 +37735,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -37857,7 +37812,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -37867,8 +37822,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -37899,8 +37854,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -37921,12 +37876,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -37936,7 +37891,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -37946,18 +37901,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -37983,7 +37938,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -38003,27 +37958,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -38033,8 +37988,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -38045,27 +38000,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -38096,18 +38051,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2342"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -38128,13 +38083,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -38155,13 +38110,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -38192,8 +38147,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -38224,8 +38179,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -38256,8 +38211,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -38278,13 +38233,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -38305,13 +38260,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -38332,17 +38287,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -38352,8 +38307,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -38379,23 +38334,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -38416,13 +38371,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -38443,13 +38398,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -38475,13 +38430,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -38507,38 +38462,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -38554,13 +38509,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -38646,8 +38601,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -38673,7 +38628,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38688,18 +38643,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38735,8 +38690,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -38767,8 +38722,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -38799,8 +38754,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -38826,7 +38781,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -38851,8 +38806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -38878,7 +38833,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -38893,7 +38848,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38908,18 +38863,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38950,7 +38905,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -38960,7 +38915,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -38975,8 +38930,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -39012,13 +38967,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -39059,7 +39014,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -39079,32 +39034,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39114,22 +39069,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -39139,17 +39094,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -39159,13 +39114,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -39191,17 +39146,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -39223,8 +39178,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -39250,12 +39205,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -39265,12 +39220,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -39312,17 +39267,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39332,7 +39287,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -39347,8 +39302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -39374,12 +39329,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -39389,8 +39344,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -39416,7 +39371,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -39436,8 +39391,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -39463,33 +39418,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -39525,7 +39480,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -39535,8 +39490,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -39567,12 +39522,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -39592,7 +39547,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -39607,12 +39562,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39627,13 +39582,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -39664,12 +39619,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -39679,8 +39634,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -39721,8 +39676,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -39763,8 +39718,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -39790,22 +39745,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -39830,23 +39785,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -39872,43 +39827,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -39934,7 +39889,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -39954,8 +39909,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -39981,12 +39936,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -39996,13 +39951,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -40028,17 +39983,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -40053,13 +40008,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -40085,13 +40040,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -40102,12 +40057,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -40122,7 +40077,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -40142,28 +40097,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -40174,18 +40129,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -40211,18 +40166,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -40248,18 +40203,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -40285,38 +40240,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -40326,7 +40281,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40335,13 +40290,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -40365,19 +40320,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -40416,8 +40371,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-2465",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "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"
@@ -40426,8 +40381,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -40437,7 +40392,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40446,19 +40401,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -40470,13 +40425,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -40520,7 +40475,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40529,55 +40484,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -40619,18 +40574,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -40640,7 +40595,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40655,25 +40610,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -40684,8 +40639,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -40727,12 +40682,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -40742,13 +40697,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -40759,11 +40714,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -40771,35 +40726,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -40810,28 +40765,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -40841,7 +40796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40850,25 +40805,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -40910,7 +40865,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -40927,8 +40882,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -40938,7 +40893,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -40947,20 +40902,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -41081,20 +41036,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -41289,20 +41244,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -41530,20 +41485,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -41795,20 +41750,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -42000,20 +41955,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2258"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2258" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -42165,20 +42120,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2278"
+     "referenced_type" : "type-2252"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2278" ],
+   "template_args" : [ "type-2252" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -42346,20 +42301,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -42527,20 +42482,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -42763,20 +42718,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -42928,20 +42883,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -43123,14 +43078,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2287"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -43287,14 +43242,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2281"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -43468,7 +43423,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43477,26 +43432,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -43585,28 +43540,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -43615,8 +43570,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -43625,8 +43580,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -43638,14 +43593,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -43671,7 +43626,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -43681,13 +43636,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -43713,12 +43668,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -43733,13 +43688,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -43760,7 +43715,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43785,18 +43740,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -43817,7 +43772,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43842,18 +43797,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -43889,13 +43844,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -43921,13 +43876,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2287"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -43953,13 +43908,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -43969,11 +43924,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -43981,11 +43936,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -43993,11 +43948,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -44005,11 +43960,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -44017,11 +43972,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -44029,11 +43984,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -44041,11 +43996,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -44053,11 +44008,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -44065,8 +44020,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -44097,8 +44052,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -44109,17 +44064,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2313"
+     "referenced_type" : "type-2288"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2289"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -44130,15 +44085,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2290"
     }
    ],
    "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-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -44149,18 +44104,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -44171,48 +44126,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -44223,14 +44178,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -44359,14 +44314,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -44447,14 +44402,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -44534,14 +44489,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -44628,14 +44583,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -44738,13 +44693,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -44794,17 +44749,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -44814,17 +44769,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44834,17 +44789,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -44854,17 +44809,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44874,17 +44829,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -44894,17 +44849,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -44914,17 +44869,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -44934,17 +44889,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -44954,17 +44909,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -44974,14 +44929,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44992,11 +44947,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -45004,11 +44959,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -45016,11 +44971,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -45028,11 +44983,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -45040,17 +44995,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -45058,17 +45013,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -45078,17 +45033,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -45098,17 +45053,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -45118,29 +45073,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2179" ],
+   "template_args" : [ "type-2151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -45148,18 +45103,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -45169,50 +45124,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -45221,17 +45176,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -45240,17 +45195,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -45261,26 +45216,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -45293,26 +45248,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -45325,17 +45280,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -45364,17 +45319,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -45403,17 +45358,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -45442,18 +45397,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -45461,15 +45416,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -45481,17 +45436,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -45520,17 +45475,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -45557,100 +45512,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -45660,7 +45531,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -45670,29 +45541,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -45702,18 +45583,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -45724,23 +45605,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -45751,7 +45632,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45776,13 +45657,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -45793,7 +45674,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45823,13 +45704,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -45845,12 +45726,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -45865,8 +45746,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -45902,8 +45783,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -45915,14 +45796,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -45934,14 +45815,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2162"
+     "referenced_type" : "type-2134"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -45951,7 +45832,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -45960,20 +45841,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -45983,7 +45864,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -45992,44 +45873,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -46064,11 +45939,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -46077,61 +45975,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46143,25 +46041,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -46173,127 +46071,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -46518,8 +46416,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -46528,8 +46426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -46573,14 +46471,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -46622,13 +46520,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -46652,7 +46550,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -46676,13 +46574,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46694,31 +46592,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -46730,8 +46628,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -46744,13 +46642,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -46762,14 +46660,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -46780,8 +46678,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -46817,14 +46715,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -46834,14 +46732,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -46851,8 +46749,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -46904,7 +46802,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -46919,8 +46817,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -46941,13 +46839,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -46959,14 +46857,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2140"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -46978,14 +46876,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -46997,14 +46895,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -47017,14 +46915,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -47064,8 +46962,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -47075,8 +46973,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -47086,8 +46984,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -47111,7 +47009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -47120,17 +47018,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2304" ],
+   "template_args" : [ "type-2280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -47325,7 +47223,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -47334,17 +47232,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2301" ],
+   "template_args" : [ "type-2277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -47574,14 +47472,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -47591,11 +47489,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2289" ],
+   "template_args" : [ "type-2260" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -47603,13 +47501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -47650,17 +47548,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -47708,17 +47606,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -47766,17 +47664,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -47824,17 +47722,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47882,17 +47780,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -47940,17 +47838,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47998,17 +47896,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -48056,17 +47954,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48114,17 +48012,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48172,17 +48070,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -48230,17 +48128,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -48288,17 +48186,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -48345,14 +48243,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -48424,13 +48322,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -48442,14 +48340,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -48461,14 +48359,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -48479,7 +48377,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -48488,62 +48386,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1894"
+     "referenced_type" : "type-1869"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2153"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -48648,23 +48546,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2304"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -48675,17 +48573,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -48730,17 +48628,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -48785,17 +48683,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -48842,7 +48740,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -48854,20 +48752,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -48919,13 +48817,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -48936,18 +48834,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2320"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -48958,18 +48856,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -48980,23 +48878,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -49006,14 +48904,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2149"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -49040,8 +48938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-2464",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -49050,8 +48948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -49060,85 +48958,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -49149,13 +49047,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2461"
+     "referenced_type" : "type-2436"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -49165,13 +49063,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2450"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -49181,13 +49079,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49197,13 +49095,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2421"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "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"
@@ -49213,13 +49111,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2443"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49229,13 +49127,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49245,13 +49143,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2413"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49261,13 +49159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2457"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49277,13 +49175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2429"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49293,13 +49191,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2459"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -49309,13 +49207,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49325,13 +49223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2427"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -49340,8 +49238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -49352,21 +49250,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -49375,21 +49273,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -49398,21 +49296,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -49421,21 +49319,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -49444,21 +49342,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -49467,21 +49365,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -49490,21 +49388,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -49513,21 +49411,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -49536,21 +49434,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -49559,21 +49457,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -49582,21 +49480,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -49605,21 +49503,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -49629,14 +49527,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -49648,14 +49546,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -49667,14 +49565,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -49686,14 +49584,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -49705,17 +49603,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -49725,26 +49623,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -49754,7 +49652,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-1805"
     }
    ],
    "fields" :
@@ -49762,13 +49660,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -49936,7 +49834,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -49944,13 +49842,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -50163,7 +50061,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -50171,13 +50069,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -50333,10 +50231,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -50345,44 +50243,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -50446,7 +50344,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -50481,11 +50379,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -50519,7 +50417,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -50528,31 +50426,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -50673,7 +50571,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -50681,18 +50579,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -50834,7 +50732,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1743"
+     "referenced_type" : "type-1717"
     }
    ],
    "fields" :
@@ -50842,13 +50740,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -50972,7 +50870,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -50980,13 +50878,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -51149,7 +51047,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -51157,13 +51055,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -51275,16 +51173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2344"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51292,16 +51190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2347"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51309,16 +51207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2372"
+     "referenced_type" : "type-2346"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51326,16 +51224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2348"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51343,220 +51241,220 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2371"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2370",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2375"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2364"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2363",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2363"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2362",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2365"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2362"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2361",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2366"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2365",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2349"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2350"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2352"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2353"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2354"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2353",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2345"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2344",
    "self_type" : "type-2344",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2346" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2349"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2340"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2339"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2338"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2324"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2325"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2330"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2320"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2321" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -51564,16 +51462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51581,16 +51479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51598,16 +51496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2357"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51615,16 +51513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51632,16 +51530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2358"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51649,16 +51547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2380"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51666,16 +51564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2359"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -51683,16 +51581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51700,16 +51598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2363"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51717,16 +51615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2362"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51734,16 +51632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2367"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2366",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51751,16 +51649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2366"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2365",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51768,16 +51666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2368"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2367",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51785,16 +51683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2365"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2364",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51802,16 +51700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2369"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2368",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -51819,372 +51717,372 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2427"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2426"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2425"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2424"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2422"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2430"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2429"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2431"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2423"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2428"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2432"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2413"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2412"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2411"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2410"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2416"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2415"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2417"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2409"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2414"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2418"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2401"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2400",
    "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2400"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2399"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2398"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2396"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2404"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2403"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2405"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2397"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2402"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2406"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2388"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2387"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2386",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2386"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2385"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2391"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2390"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2392"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2384"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2389"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2393"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2375"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -52193,13 +52091,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2400"
+     "referenced_type" : "type-2374"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2373",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52210,13 +52108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2399"
+     "referenced_type" : "type-2373"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52227,13 +52125,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52244,13 +52142,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2378"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52261,13 +52159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2377"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2376",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52278,13 +52176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2379"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2378",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52295,13 +52193,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2376"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52312,13 +52210,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2380"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2379",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52329,16 +52227,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2358"
+     "referenced_type" : "type-2333"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52346,16 +52244,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2332"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52363,16 +52261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2334"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -52380,16 +52278,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2335"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -52398,7 +52296,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -52408,11 +52306,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -52421,21 +52319,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52444,21 +52342,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -52467,21 +52365,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52490,21 +52388,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -52513,21 +52411,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -52541,16 +52439,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -52569,8 +52467,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -52583,17 +52481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -52603,17 +52501,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -52623,17 +52521,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -52643,17 +52541,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -52663,17 +52561,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -52683,17 +52581,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -52703,17 +52601,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -52723,17 +52621,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -52743,17 +52641,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -52763,317 +52661,317 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-662"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "record_kind" : "class",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-259"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-235"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-802"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-641"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-438"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
+   "record_kind" : "class",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2519"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2258" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
   },
   {
@@ -53083,17 +52981,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-127" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
   },
   {
@@ -53103,17 +53001,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance>",
    "name" : "android::sp<android::OMXNodeInstance>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
+   "template_args" : [ "type-825" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
   },
   {
@@ -53123,17 +53021,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
    "name" : "android::sp<android::OmxGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
+   "template_args" : [ "type-794" ],
    "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
   },
   {
@@ -53143,17 +53041,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2154"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2183" ],
+   "template_args" : [ "type-2155" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -53163,17 +53061,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2509"
+     "referenced_type" : "type-2485"
     }
    ],
    "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-2508",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2511" ],
+   "template_args" : [ "type-2487" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -53183,17 +53081,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2502"
+     "referenced_type" : "type-2477"
     }
    ],
    "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-2501",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2504" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -53203,17 +53101,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-40"
     }
    ],
    "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-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -53223,17 +53121,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-33"
     }
    ],
    "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-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -53243,17 +53141,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -53263,17 +53161,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2493"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2519" ],
+   "template_args" : [ "type-2495" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -53283,17 +53181,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -53303,17 +53201,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -53323,17 +53221,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -53343,17 +53241,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -53363,17 +53261,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -53383,17 +53281,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -53403,17 +53301,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -53423,223 +53321,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2489"
+     "referenced_type" : "type-2465"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2491" ],
+   "template_args" : [ "type-2467" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53649,283 +53547,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -53935,8 +53833,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53946,327 +53844,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54276,8 +54174,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54287,327 +54185,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54617,8 +54515,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54628,338 +54526,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1708",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1699",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54969,8 +54867,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54980,250 +54878,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -55234,16 +55132,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -55251,16 +55149,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -55268,16 +55166,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -55285,16 +55183,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -55302,16 +55200,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -55319,16 +55217,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1859"
+     "referenced_type" : "type-1837"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55336,16 +55234,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -55353,16 +55251,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1829"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55370,16 +55268,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -55387,16 +55285,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -55404,16 +55302,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -55421,16 +55319,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -55440,23 +55338,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -55466,23 +55364,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -55492,23 +55390,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -55518,23 +55416,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -55544,23 +55442,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -55570,23 +55468,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -55595,18 +55493,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -55622,18 +55520,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2123"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -55644,7 +55542,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2119"
     },
     {
      "field_name" : "num_planes",
@@ -55654,13 +55552,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -55671,48 +55569,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2117"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -55723,38 +55621,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -55765,18 +55663,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -55787,17 +55685,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -55817,13 +55715,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -55833,13 +55731,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -55850,35 +55748,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -55899,8 +55797,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -55911,43 +55809,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -55958,32 +55856,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -55993,13 +55891,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -56010,32 +55908,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -56045,13 +55943,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -56062,17 +55960,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -56102,13 +56000,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -56119,28 +56017,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -56152,8 +56050,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -56161,8 +56059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -56170,8 +56068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56179,8 +56077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56188,8 +56086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56197,8 +56095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56206,8 +56104,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 0752e71..0000000
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28763 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-483",
-   "self_type" : "type-485",
-   "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-461",
-   "self_type" : "type-465",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 2048,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-806",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-583",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-584",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-681",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-682",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-678",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long double",
-   "name" : "long double",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "__aeabi_memclr"
-  },
-  {
-   "name" : "__aeabi_memclr4"
-  },
-  {
-   "name" : "__aeabi_memclr8"
-  },
-  {
-   "name" : "__aeabi_memcpy"
-  },
-  {
-   "name" : "__aeabi_memcpy4"
-  },
-  {
-   "name" : "__aeabi_memcpy8"
-  },
-  {
-   "name" : "__aeabi_memmove"
-  },
-  {
-   "name" : "__aeabi_memmove4"
-  },
-  {
-   "name" : "__aeabi_memmove8"
-  },
-  {
-   "name" : "__aeabi_memset"
-  },
-  {
-   "name" : "__aeabi_memset4"
-  },
-  {
-   "name" : "__aeabi_memset8"
-  },
-  {
-   "name" : "__aeabi_uidiv"
-  },
-  {
-   "name" : "__udivsi3"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-690",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-688",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-815",
-   "return_type" : "type-30",
-   "self_type" : "type-815",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-1017"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-780",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-840"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-727"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-986"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-769",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-837",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-743",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-869",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-686",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-665",
-   "self_type" : "type-675",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-438",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-490",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1029",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-992",
-   "self_type" : "type-991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1013",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-726",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-834",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-967",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-737",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-734",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-869",
-   "self_type" : "type-976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-815",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1031",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-447",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-458",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-991",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-730",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-728",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 80,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-726",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-979",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-834",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-477",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-766",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-758",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-778",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-450",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-985",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-1000",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-737",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1009",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-743",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-749",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-734",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "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-479",
-   "self_type" : "type-478",
-   "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-519",
-   "self_type" : "type-518",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-969",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-788",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-441",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-432",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-422",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-434",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-428",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-838",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-558"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-493"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-488"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-532"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-534"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-520"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-552"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-550"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-491"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-454"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-453"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-482"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-485"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-507"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-509"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-502"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-503"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-590"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-582"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-618"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-602"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-621"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-712"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-594"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-613"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-600"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-671"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-669"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-679"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-681"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-682"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-676"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-467"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-615"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-592"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-689"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-690"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-684"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-688"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-690"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-663"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-652"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-653"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-628"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-630"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-638"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-639"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-633"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-631"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-642"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-645"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-646"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-650"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-648"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-962",
-   "self_type" : "type-962",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 2088,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-567" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1018"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-810"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1016",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-565"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-959"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-946"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-944"
-    }
-   ],
-   "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-943",
-   "self_type" : "type-943",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-942"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-935"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-934",
-   "self_type" : "type-934",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-938"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-955"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-953"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-940"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-951"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-874"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-873"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-850" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-849" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-845" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-890"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-889"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-888",
-   "self_type" : "type-888",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-894"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-892"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-896"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-895",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-927"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-926",
-   "self_type" : "type-926",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-926"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-925",
-   "self_type" : "type-925",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-925"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-924",
-   "self_type" : "type-924",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-924"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-922"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-921",
-   "self_type" : "type-921",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-930"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-928"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-932"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-914"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-913"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-911"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-917"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-916"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-918"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-915"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-919"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-918",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-901"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-900"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-905"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-904",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-903"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-907"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-861"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-725"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-978"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-979" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-753",
-   "self_type" : "type-753",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-720",
-   "self_type" : "type-720",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1036",
-   "self_type" : "type-1036",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1023",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1034",
-   "self_type" : "type-1034",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1005",
-   "self_type" : "type-1005",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-683",
-   "self_type" : "type-683",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1028",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1035",
-   "self_type" : "type-1035",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1006",
-   "self_type" : "type-1006",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-724",
-   "self_type" : "type-724",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-936",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1022",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-897",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-802"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-804"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-800"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-776",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
index a217662..34eb0df 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -38,16 +18,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 8
   },
   {
@@ -55,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -64,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 8
   },
   {
@@ -81,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 8
   },
   {
@@ -90,8 +70,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -100,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -110,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
@@ -120,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 4
   },
   {
@@ -130,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 8
   },
   {
@@ -140,66 +120,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -214,19 +239,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -234,6 +279,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -298,6 +355,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -318,11 +379,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -330,7 +427,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -338,6 +459,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -389,389 +522,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -781,10 +603,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -794,10 +616,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -807,10 +629,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -820,24 +642,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -847,10 +655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -860,24 +668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -887,37 +681,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -925,10 +701,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -936,8 +721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +730,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -958,7 +752,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -966,8 +760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -975,35 +769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1016,8 +783,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1025,8 +792,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1035,19 +802,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1055,8 +822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1065,8 +832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1075,8 +842,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1089,92 +866,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1182,7 +875,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1192,39 +885,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1234,18 +937,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1256,23 +959,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
index 2c6c0a2..2184219 100644
--- a/Q/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2200",
    "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-1707",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2250",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3612",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-3782",
-   "self_type" : "type-3781",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4205",
-   "self_type" : "type-4204",
+   "referenced_type" : "type-4181",
+   "self_type" : "type-4180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4319",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-4730",
-   "self_type" : "type-4729",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4701",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -147,8 +147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -156,8 +156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -165,8 +165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -174,8 +174,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -183,49 +183,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2123",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2263",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -233,8 +224,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -242,143 +233,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2264",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2993",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3374",
-   "self_type" : "type-3373",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-3777",
-   "self_type" : "type-3776",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4201",
-   "self_type" : "type-4200",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4314",
-   "self_type" : "type-4313",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-4726",
-   "self_type" : "type-4725",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -387,7 +252,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -396,7 +261,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -405,7 +270,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -414,7 +279,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -423,7 +288,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -432,7 +297,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -441,7 +306,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -450,7 +315,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -463,8 +328,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -473,8 +338,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -483,24 +348,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -508,8 +373,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -517,16 +382,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 8
   },
   {
@@ -534,8 +399,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -543,8 +408,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -552,8 +417,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -582,8 +447,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 4
   },
   {
@@ -592,8 +457,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -602,15 +467,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -1033,10 +898,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1174,6 +1039,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1512,6 +1380,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1520,9 +1392,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1598,10 +1486,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1811,7 +1695,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1885,8 +1769,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1963,8 +1847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2017,8 +1901,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2115,8 +1999,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2161,8 +2045,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2211,8 +2095,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2261,8 +2145,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2303,8 +2187,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "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",
@@ -2369,8 +2253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2395,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2437,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2591,8 +2475,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2637,8 +2521,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2679,8 +2563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2737,8 +2621,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2675,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2833,8 +2717,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2879,8 +2763,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2917,8 +2801,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2839,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3013,8 +2897,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3047,8 +2931,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3081,8 +2965,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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",
@@ -3123,8 +3007,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3165,8 +3049,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3191,8 +3075,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3229,8 +3113,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3283,8 +3167,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3525,8 +3409,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3571,8 +3455,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3677,8 +3561,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3719,8 +3603,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3745,8 +3629,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3923,11 +3807,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3997,8 +3881,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4063,8 +3947,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4097,8 +3981,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4143,8 +4027,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4213,8 +4097,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4279,8 +4163,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4329,8 +4213,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4371,8 +4255,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4421,8 +4305,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4463,8 +4347,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4657,8 +4541,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5355,8 +5239,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5517,8 +5401,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5559,8 +5443,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5597,8 +5481,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5635,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5677,8 +5561,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5715,8 +5599,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5745,8 +5629,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5675,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5833,8 +5717,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5883,8 +5767,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5917,8 +5801,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5951,8 +5835,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5989,8 +5873,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5911,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6061,8 +5945,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6099,8 +5983,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6153,8 +6037,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6179,8 +6063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6205,8 +6089,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6311,8 +6195,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6349,8 +6233,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6371,8 +6255,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6425,8 +6309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6463,8 +6347,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6545,8 +6429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6595,8 +6479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6653,8 +6537,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6715,8 +6599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6773,8 +6657,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6961,8 +6845,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7003,8 +6887,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7041,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7083,8 +6967,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7179,8 +7063,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7245,8 +7129,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7335,8 +7219,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7393,8 +7277,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7435,8 +7319,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7473,8 +7357,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7499,8 +7383,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7577,8 +7461,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7631,8 +7515,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7673,8 +7557,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7623,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7781,8 +7665,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7839,8 +7723,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7865,8 +7749,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7891,8 +7775,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7937,8 +7821,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7983,8 +7867,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8013,8 +7897,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8071,8 +7955,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8137,8 +8021,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8171,8 +8055,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8237,8 +8121,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8295,8 +8179,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8317,8 +8201,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8335,65 +8219,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8432,8 +8265,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8470,8 +8303,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8500,8 +8333,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8522,8 +8355,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8556,11 +8389,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8582,8 +8415,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8609,8 +8442,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8627,8 +8460,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8645,8 +8478,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8671,8 +8504,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8713,8 +8546,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8775,11 +8608,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8879,8 +8712,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8905,8 +8738,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8947,8 +8780,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9189,8 +9022,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9219,8 +9052,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2108",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9249,8 +9082,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9291,8 +9124,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9329,8 +9162,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9355,8 +9188,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9373,8 +9206,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9403,8 +9236,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9497,8 +9330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9539,8 +9372,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9557,8 +9390,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2114",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9587,8 +9420,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9621,8 +9454,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9675,8 +9508,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9692,12 +9525,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9707,15 +9540,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9725,24 +9558,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9752,27 +9585,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9782,24 +9615,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9809,18 +9642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9830,21 +9663,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9854,18 +9687,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9875,15 +9708,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9893,18 +9726,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9914,24 +9747,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9941,18 +9774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9962,18 +9795,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9983,24 +9816,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10010,18 +9843,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10031,13 +9864,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -10046,12 +9879,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10061,12 +9894,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2156",
-   "return_type" : "type-67",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2128",
+   "return_type" : "type-60",
+   "self_type" : "type-2128",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -10076,27 +9909,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -10108,10 +9941,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -10122,10 +9955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1994"
+     "referenced_type" : "type-1964"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10136,10 +9969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2003"
+     "referenced_type" : "type-1973"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10150,10 +9983,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10163,13 +9996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10179,20 +10012,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10202,7 +10035,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10211,7 +10044,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10221,13 +10054,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10237,26 +10070,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10266,16 +10099,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10285,16 +10118,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2538"
+     "referenced_type" : "type-2526"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10305,22 +10138,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-2522"
     },
     {
-     "referenced_type" : "type-2495"
+     "referenced_type" : "type-2471"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10331,10 +10164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10347,19 +10180,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10370,10 +10203,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10386,19 +10219,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10409,25 +10242,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10438,7 +10271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10453,13 +10286,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10470,13 +10303,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10486,10 +10319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10500,16 +10333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10520,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10529,7 +10362,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10539,13 +10372,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10556,10 +10389,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10570,13 +10403,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10419,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10435,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,7 +10455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10631,7 +10464,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10642,7 +10475,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10651,7 +10484,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10661,16 +10494,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10681,13 +10514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10698,10 +10531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10712,13 +10545,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10728,16 +10561,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10748,13 +10581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10765,7 +10598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10774,7 +10607,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10785,19 +10618,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10808,13 +10641,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10825,19 +10658,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10848,13 +10681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10865,19 +10698,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10887,7 +10720,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10896,16 +10729,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10916,25 +10749,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10945,19 +10778,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10967,16 +10800,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10987,13 +10820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11004,16 +10837,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11023,22 +10856,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11049,19 +10882,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11072,25 +10905,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11100,13 +10933,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -11115,7 +10948,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11126,22 +10959,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11152,22 +10985,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11178,19 +11011,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11200,10 +11033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11213,13 +11046,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11228,10 +11061,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11241,10 +11074,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11253,7 +11086,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11263,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11276,10 +11109,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11289,19 +11122,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11311,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11333,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11349,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11365,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11387,19 +11220,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11409,19 +11242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11432,10 +11265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11446,10 +11279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11460,10 +11293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11472,13 +11305,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11487,13 +11320,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11502,10 +11335,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11514,13 +11347,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11529,19 +11362,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11551,10 +11384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11564,10 +11397,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11577,16 +11410,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11598,7 +11431,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11608,10 +11441,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11621,13 +11454,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11637,13 +11470,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11653,13 +11486,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11668,10 +11501,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11681,13 +11514,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11697,13 +11530,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11713,13 +11546,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11729,13 +11562,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-1933"
+     "referenced_type" : "type-1904"
     }
    ],
-   "return_type" : "type-2553",
+   "return_type" : "type-2543",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11745,13 +11578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11761,13 +11594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1930"
+     "referenced_type" : "type-1901"
     },
     {
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11777,10 +11610,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11790,10 +11623,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11803,13 +11636,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11819,16 +11652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2072"
+     "referenced_type" : "type-2043"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11838,10 +11671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     }
    ],
-   "return_type" : "type-2261",
+   "return_type" : "type-2236",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11851,13 +11684,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11867,13 +11700,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1836"
+     "referenced_type" : "type-1807"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11883,10 +11716,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2556",
+   "return_type" : "type-2546",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11896,10 +11729,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2557",
+   "return_type" : "type-2547",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11909,13 +11742,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2558",
+   "return_type" : "type-2548",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11925,16 +11758,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2075"
+     "referenced_type" : "type-2047"
     }
    ],
-   "return_type" : "type-2559",
+   "return_type" : "type-2549",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11944,10 +11777,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-2560",
+   "return_type" : "type-2550",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11957,13 +11790,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11973,13 +11806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1744"
+     "referenced_type" : "type-1718"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11989,16 +11822,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2563",
+   "return_type" : "type-2553",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12008,13 +11841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2564",
+   "return_type" : "type-2554",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12024,13 +11857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2565",
+   "return_type" : "type-2555",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12040,13 +11873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-2566",
+   "return_type" : "type-2556",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12056,13 +11889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2567",
+   "return_type" : "type-2557",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12072,16 +11905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-2568",
+   "return_type" : "type-2558",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12091,13 +11924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-2570"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-2569",
+   "return_type" : "type-2559",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12107,10 +11940,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-2571",
+   "return_type" : "type-2561",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12120,13 +11953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-2572",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12136,16 +11969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-2573",
+   "return_type" : "type-2563",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12155,13 +11988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-2575",
+   "return_type" : "type-2565",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12171,13 +12004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12187,13 +12020,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12203,16 +12036,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12222,19 +12055,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-2579"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-2578",
+   "return_type" : "type-2568",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12244,13 +12077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2581"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-2580",
+   "return_type" : "type-2570",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12260,13 +12093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2510"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12276,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-2582",
+   "return_type" : "type-2572",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12292,10 +12125,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12305,10 +12138,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12318,10 +12151,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12331,10 +12164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12344,10 +12177,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12357,13 +12190,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-2584",
+   "return_type" : "type-2574",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12373,13 +12206,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-2586",
+   "return_type" : "type-2576",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12389,13 +12222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-2588",
+   "return_type" : "type-2578",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12405,79 +12238,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-2589",
+   "return_type" : "type-2579",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12487,10 +12320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12500,10 +12333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12513,10 +12346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12526,20 +12359,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12549,7 +12382,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12558,7 +12391,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12568,26 +12401,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12597,16 +12430,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12616,16 +12449,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12635,19 +12468,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12657,19 +12490,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12679,13 +12512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1768"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12695,13 +12528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-2482"
+     "referenced_type" : "type-2457"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12711,16 +12544,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12730,7 +12563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
@@ -12739,16 +12572,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2130"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,16 +12591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12777,22 +12610,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12802,13 +12635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12817,7 +12650,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12827,10 +12660,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12840,19 +12673,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12862,19 +12695,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12884,19 +12717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1764"
+     "referenced_type" : "type-1733"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12906,13 +12739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12922,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1759"
+     "referenced_type" : "type-1730"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12938,19 +12771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2593",
+   "return_type" : "type-2583",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,7 +12793,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12969,7 +12802,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2594",
+   "return_type" : "type-2584",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12979,25 +12812,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1780"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-2595",
+   "return_type" : "type-2585",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13007,16 +12840,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2596",
+   "return_type" : "type-2586",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13026,16 +12859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-2597",
+   "return_type" : "type-2587",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13045,19 +12878,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2600"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-2599",
+   "return_type" : "type-2589",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13067,16 +12900,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2601",
+   "return_type" : "type-2591",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13086,13 +12919,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1788"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-2602",
+   "return_type" : "type-2592",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-2603",
+   "return_type" : "type-2593",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13118,16 +12951,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-1783"
+     "referenced_type" : "type-1753"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2595"
     }
    ],
-   "return_type" : "type-2604",
+   "return_type" : "type-2594",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,19 +12970,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2607"
+     "referenced_type" : "type-2597"
     }
    ],
-   "return_type" : "type-2606",
+   "return_type" : "type-2596",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13159,16 +12992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2609"
+     "referenced_type" : "type-2599"
     }
    ],
-   "return_type" : "type-2608",
+   "return_type" : "type-2598",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,22 +13011,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2611"
+     "referenced_type" : "type-2601"
     }
    ],
-   "return_type" : "type-2610",
+   "return_type" : "type-2600",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13203,13 +13036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13218,7 +13051,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2612",
+   "return_type" : "type-2602",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13228,10 +13061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-2613",
+   "return_type" : "type-2603",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13241,19 +13074,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     },
     {
-     "referenced_type" : "type-2615"
+     "referenced_type" : "type-2605"
     }
    ],
-   "return_type" : "type-2614",
+   "return_type" : "type-2604",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13263,16 +13096,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-2616",
+   "return_type" : "type-2606",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13282,19 +13115,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1747"
     },
     {
-     "referenced_type" : "type-2618"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-2617",
+   "return_type" : "type-2607",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13304,13 +13137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13320,13 +13153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13337,10 +13170,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13351,10 +13184,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13364,10 +13211,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13376,7 +13223,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13386,16 +13233,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2088"
+     "referenced_type" : "type-2075"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13405,22 +13252,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2210"
+     "referenced_type" : "type-2184"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2185"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13430,13 +13277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13447,13 +13294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13464,13 +13311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13480,10 +13327,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13493,10 +13340,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13506,10 +13353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13519,10 +13366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13532,10 +13379,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13546,16 +13393,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13566,16 +13413,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13586,16 +13433,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13606,19 +13453,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13629,19 +13476,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13652,19 +13499,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13675,19 +13522,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13698,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13718,16 +13565,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13738,16 +13585,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13758,19 +13605,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13781,19 +13628,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13804,19 +13651,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13827,19 +13674,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13850,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13870,16 +13717,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13890,16 +13737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13910,19 +13757,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13933,19 +13780,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13956,19 +13803,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13979,19 +13826,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2069"
+     "referenced_type" : "type-2046"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14002,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14022,16 +13869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14042,16 +13889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14062,19 +13909,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14085,19 +13932,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14108,19 +13955,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14131,19 +13978,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2082"
+     "referenced_type" : "type-2056"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14154,16 +14001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14174,16 +14021,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14194,16 +14041,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14214,19 +14061,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14237,19 +14084,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14260,19 +14107,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14283,19 +14130,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14306,16 +14153,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14326,16 +14173,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14346,16 +14193,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14366,19 +14213,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14389,19 +14236,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14412,19 +14259,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14435,19 +14282,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14458,16 +14305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14478,16 +14325,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14498,16 +14345,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14518,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14541,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14564,19 +14411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14587,19 +14434,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14610,16 +14457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14630,16 +14477,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14650,16 +14497,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14670,19 +14517,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14693,19 +14540,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14716,19 +14563,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14739,19 +14586,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14762,16 +14609,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14782,16 +14629,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14802,16 +14649,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14822,19 +14669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14845,19 +14692,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14868,19 +14715,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14891,19 +14738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14914,16 +14761,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14934,16 +14781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14954,19 +14801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14977,19 +14824,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15000,19 +14847,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15023,19 +14870,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15046,16 +14893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15066,16 +14913,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15086,19 +14933,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15109,19 +14956,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15132,19 +14979,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15155,19 +15002,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15177,16 +15024,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15195,14 +15042,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15211,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15220,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15229,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15238,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15247,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15256,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3836",
+   "referenced_type" : "type-3808",
+   "self_type" : "type-3807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15265,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15274,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3037",
+   "self_type" : "type-3036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15283,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3843",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3814",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15292,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15301,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15310,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15319,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15328,8 +15169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15337,8 +15178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15346,8 +15187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15355,8 +15196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2910",
+   "self_type" : "type-2909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15364,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15373,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3314",
-   "self_type" : "type-3313",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15382,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15391,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3544",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15400,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3736",
-   "self_type" : "type-3735",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15409,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3940",
-   "self_type" : "type-3939",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15418,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4024",
-   "self_type" : "type-4023",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15427,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4194",
-   "self_type" : "type-4193",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15436,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4348",
-   "self_type" : "type-4347",
+   "referenced_type" : "type-4322",
+   "self_type" : "type-4321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15445,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15454,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4472",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15463,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15472,17 +15313,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2206",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15490,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15499,35 +15340,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2197",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15544,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15553,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15562,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15571,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15580,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15589,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15598,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15607,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15616,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15625,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2858",
-   "self_type" : "type-2857",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15634,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15643,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15652,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3312",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15661,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15670,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15679,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3679",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15688,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3752",
-   "self_type" : "type-3751",
+   "referenced_type" : "type-3725",
+   "self_type" : "type-3724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15697,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3915",
+   "self_type" : "type-3914",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15706,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4020",
-   "self_type" : "type-4019",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3992",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15715,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4183",
-   "self_type" : "type-4182",
+   "referenced_type" : "type-4161",
+   "self_type" : "type-4160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15724,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4304",
-   "self_type" : "type-4303",
+   "referenced_type" : "type-4278",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15733,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15742,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15751,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4594",
-   "self_type" : "type-4593",
+   "referenced_type" : "type-4568",
+   "self_type" : "type-4567",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15760,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15769,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15778,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15787,8 +15628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15796,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15805,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15814,8 +15655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15823,8 +15664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15832,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15841,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15850,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15859,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15868,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15877,8 +15718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15886,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15895,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15904,8 +15745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15913,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15922,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15931,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15949,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15958,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15967,8 +15808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15976,8 +15817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15985,8 +15826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15994,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16003,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -16012,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16021,8 +15862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16030,861 +15871,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2125",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3367",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3527",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-3828",
-   "self_type" : "type-3830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4083",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4248",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4383",
-   "self_type" : "type-4385",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4522",
-   "self_type" : "type-4524",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-4641",
-   "self_type" : "type-4643",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2205",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1976",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3037",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3355",
-   "self_type" : "type-3357",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3517",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3645",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-3816",
-   "self_type" : "type-3818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4071",
-   "self_type" : "type-4073",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4238",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4324",
-   "self_type" : "type-4326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4511",
-   "self_type" : "type-4513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-4631",
-   "self_type" : "type-4633",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1812",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3342",
-   "self_type" : "type-3344",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3503",
-   "self_type" : "type-3505",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-3802",
-   "self_type" : "type-3804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4056",
-   "self_type" : "type-4058",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4224",
-   "self_type" : "type-4226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4367",
-   "self_type" : "type-4369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4496",
-   "self_type" : "type-4498",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-4596",
-   "self_type" : "type-4598",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2057",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4165",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2089",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3006",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3329",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3490",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-3786",
-   "self_type" : "type-3789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4042",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4357",
-   "self_type" : "type-4359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-4609",
-   "self_type" : "type-4611",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16892,1025 +15878,44 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2075",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3027",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1956",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3349",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3810",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4062",
-   "self_type" : "type-4064",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4233",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4337",
-   "self_type" : "type-4339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4504",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-4599",
-   "self_type" : "type-4601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2997",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3381",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3780",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4097",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-4340",
-   "self_type" : "type-4342",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1933",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-4468",
-   "self_type" : "type-4470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-4330",
-   "self_type" : "type-4332",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1981",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3045",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3520",
-   "self_type" : "type-3522",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3825",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4078",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4241",
-   "self_type" : "type-4243",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4334",
-   "self_type" : "type-4336",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-4636",
-   "self_type" : "type-4638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1818",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3350",
-   "self_type" : "type-3352",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-3811",
-   "self_type" : "type-3813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4065",
-   "self_type" : "type-4067",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4197",
-   "self_type" : "type-4199",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4372",
-   "self_type" : "type-4375",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4505",
-   "self_type" : "type-4507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-4626",
-   "self_type" : "type-4628",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1992",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3055",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3370",
-   "self_type" : "type-3372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3532",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-3833",
-   "self_type" : "type-3835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4086",
-   "self_type" : "type-4088",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4253",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4390",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4529",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-4648",
-   "self_type" : "type-4650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3016",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3339",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3500",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-3797",
-   "self_type" : "type-3799",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4051",
-   "self_type" : "type-4053",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4221",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4343",
-   "self_type" : "type-4345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4490",
-   "self_type" : "type-4493",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-4619",
-   "self_type" : "type-4621",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1796",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2085",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3324",
-   "self_type" : "type-3326",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3487",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3785",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4206",
-   "self_type" : "type-4208",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4351",
-   "self_type" : "type-4353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4476",
-   "self_type" : "type-4478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-4606",
-   "self_type" : "type-4608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-980",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1768",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1950",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
    "referenced_type" : "type-2092",
    "self_type" : "type-2094",
    "size" : 4,
@@ -17918,26 +15923,197 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3011",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3020",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3344",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4055",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4359",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4496",
+   "self_type" : "type-4498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4617",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2801",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3010",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
    "referenced_type" : "type-3332",
    "self_type" : "type-3334",
    "size" : 4,
@@ -17945,89 +16121,1124 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3493",
-   "self_type" : "type-3495",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3490",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3647",
-   "self_type" : "type-3649",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3794",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4045",
-   "self_type" : "type-4047",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4214",
-   "self_type" : "type-4216",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4327",
-   "self_type" : "type-4329",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4298",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4485",
-   "self_type" : "type-4487",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-4614",
-   "self_type" : "type-4616",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-4605",
+   "self_type" : "type-4607",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3480",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4028",
+   "self_type" : "type-4030",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4200",
+   "self_type" : "type-4202",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4341",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2240",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1915",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2979",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3465",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3759",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4187",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4329",
+   "self_type" : "type-4331",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4585",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1750",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1937",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3326",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3485",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4205",
+   "self_type" : "type-4207",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4311",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4479",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-980",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2970",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3354",
+   "self_type" : "type-3356",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3751",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4068",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-4314",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1904",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4444",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-4304",
+   "self_type" : "type-4306",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3013",
+   "self_type" : "type-3015",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3339",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4050",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4219",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4308",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4612",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1940",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3329",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3455",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3783",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4039",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4177",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4347",
+   "self_type" : "type-4349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4602",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -18035,10 +17246,649 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3028",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3349",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3806",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4622",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1757",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1926",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2989",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4025",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4195",
+   "self_type" : "type-4197",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4319",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4468",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1767",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3303",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-3754",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4009",
+   "self_type" : "type-4012",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4328",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4582",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1920",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2984",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3470",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-3762",
+   "self_type" : "type-3764",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4020",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4190",
+   "self_type" : "type-4192",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4459",
+   "self_type" : "type-4461",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18046,8 +17896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2852",
+   "self_type" : "type-2854",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18055,8 +17905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3700",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18064,8 +17914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18073,8 +17923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18082,8 +17932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18091,8 +17941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18100,8 +17950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18109,8 +17959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18118,8 +17968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18127,8 +17977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18136,8 +17986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -18145,8 +17995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18154,8 +18004,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18163,8 +18013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18172,8 +18022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18181,8 +18031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18190,8 +18040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18199,8 +18049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -18208,8 +18058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18217,8 +18067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -18226,8 +18076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18235,8 +18085,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18244,8 +18094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18253,8 +18103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18262,8 +18112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18271,8 +18121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18280,8 +18130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18289,8 +18139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18298,8 +18148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18307,8 +18157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18316,8 +18166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18325,8 +18175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1928",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1900",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -18334,17 +18184,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-4464",
-   "self_type" : "type-4466",
+   "referenced_type" : "type-4438",
+   "self_type" : "type-4440",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3353",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18352,8 +18229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1938",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18361,8 +18238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18370,8 +18247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18379,8 +18256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18388,8 +18265,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18397,8 +18274,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18406,8 +18283,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-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18415,8 +18292,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-3207",
-   "self_type" : "type-3206",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18424,8 +18301,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-3320",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18433,8 +18310,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-3930",
-   "self_type" : "type-3929",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18442,8 +18319,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-4031",
-   "self_type" : "type-4030",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18451,8 +18328,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-4460",
-   "self_type" : "type-4459",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18460,8 +18337,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18469,8 +18346,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3622",
+   "self_type" : "type-3621",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18478,8 +18355,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -18488,7 +18365,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18496,8 +18373,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -18508,8 +18385,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18517,8 +18394,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18526,8 +18403,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-3697",
-   "self_type" : "type-3696",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18535,8 +18412,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4653",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18544,26 +18421,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18571,8 +18448,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18580,8 +18457,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18589,8 +18466,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18598,8 +18475,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18607,8 +18484,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18616,8 +18493,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18625,8 +18502,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18634,8 +18511,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2915",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18643,8 +18520,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18652,8 +18529,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18661,8 +18538,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18670,8 +18547,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18679,8 +18556,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3672",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18688,8 +18565,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18697,8 +18574,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18706,8 +18583,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18715,8 +18592,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18724,8 +18601,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4179",
-   "self_type" : "type-4178",
+   "referenced_type" : "type-4157",
+   "self_type" : "type-4156",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18733,8 +18610,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4302",
-   "self_type" : "type-4301",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4275",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18742,8 +18619,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18751,8 +18628,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4590",
-   "self_type" : "type-4589",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18760,8 +18637,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18769,8 +18646,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18778,8 +18655,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -18787,8 +18664,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18796,8 +18673,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18805,150 +18682,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -18956,35 +18689,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2185",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -18992,11 +18761,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -19004,7 +18881,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19012,8 +18889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19021,8 +18898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19030,8 +18907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19039,8 +18916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19048,8 +18925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19057,8 +18934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19066,8 +18943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2767",
-   "self_type" : "type-2766",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19075,8 +18952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19084,8 +18961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19093,8 +18970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3208",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19102,8 +18979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19111,8 +18988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3453",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19120,8 +18997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3621",
-   "self_type" : "type-3620",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19129,8 +19006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3671",
-   "self_type" : "type-3670",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19138,8 +19015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19147,8 +19024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19156,8 +19033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19165,8 +19042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4015",
-   "self_type" : "type-4014",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19174,8 +19051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4177",
-   "self_type" : "type-4176",
+   "referenced_type" : "type-4155",
+   "self_type" : "type-4154",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19183,8 +19060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4300",
-   "self_type" : "type-4299",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19192,8 +19069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4448",
-   "self_type" : "type-4447",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19201,8 +19078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4588",
-   "self_type" : "type-4587",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19210,8 +19087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19219,8 +19096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19228,8 +19105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19237,8 +19114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-3631",
-   "self_type" : "type-3630",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19246,8 +19123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4659",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19255,8 +19132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19264,8 +19141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19273,1995 +19150,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3418",
-   "self_type" : "type-3417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3722",
-   "self_type" : "type-3721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-4141",
-   "self_type" : "type-4140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3126",
-   "self_type" : "type-3125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3410",
-   "self_type" : "type-3409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3592",
-   "self_type" : "type-3591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3714",
-   "self_type" : "type-3713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3894",
-   "self_type" : "type-3893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4132",
-   "self_type" : "type-4131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-4666",
-   "self_type" : "type-4665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3408",
-   "self_type" : "type-3407",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3712",
-   "self_type" : "type-3711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-3892",
-   "self_type" : "type-3891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-4130",
-   "self_type" : "type-4129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1994",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2905",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3412",
-   "self_type" : "type-3411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3716",
-   "self_type" : "type-3715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-3896",
-   "self_type" : "type-3895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-4135",
-   "self_type" : "type-4134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3406",
-   "self_type" : "type-3405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3754",
-   "self_type" : "type-3753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3964",
-   "self_type" : "type-3963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-4128",
-   "self_type" : "type-4127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3042",
-   "self_type" : "type-3041",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3389",
-   "self_type" : "type-3388",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3581",
-   "self_type" : "type-3580",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-3966",
-   "self_type" : "type-3965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4107",
-   "self_type" : "type-4106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4277",
-   "self_type" : "type-4276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4414",
-   "self_type" : "type-4413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-4550",
-   "self_type" : "type-4549",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2911",
-   "self_type" : "type-2910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3416",
-   "self_type" : "type-3415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-3900",
-   "self_type" : "type-3899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-4139",
-   "self_type" : "type-4138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3265",
-   "self_type" : "type-3264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3390",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3575",
-   "self_type" : "type-3574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3968",
-   "self_type" : "type-3967",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4110",
-   "self_type" : "type-4109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4272",
-   "self_type" : "type-4271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4417",
-   "self_type" : "type-4416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4552",
-   "self_type" : "type-4551",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3219",
-   "self_type" : "type-3218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3316",
-   "self_type" : "type-3315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3738",
-   "self_type" : "type-3737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3942",
-   "self_type" : "type-3941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4026",
-   "self_type" : "type-4025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4196",
-   "self_type" : "type-4195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4350",
-   "self_type" : "type-4349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4456",
-   "self_type" : "type-4455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4475",
-   "self_type" : "type-4474",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4605",
-   "self_type" : "type-4604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3414",
-   "self_type" : "type-3413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3897",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-4137",
-   "self_type" : "type-4136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3396",
-   "self_type" : "type-3395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3768",
-   "self_type" : "type-3767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3890",
-   "self_type" : "type-3889",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4116",
-   "self_type" : "type-4115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3536",
-   "self_type" : "type-3535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3872",
-   "self_type" : "type-3871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3431",
-   "self_type" : "type-3430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3913",
-   "self_type" : "type-3912",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4153",
-   "self_type" : "type-4152",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4269",
-   "self_type" : "type-4268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4433",
-   "self_type" : "type-4432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-4569",
-   "self_type" : "type-4568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2126",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3528",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-3832",
-   "self_type" : "type-3831",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4250",
-   "self_type" : "type-4249",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4387",
-   "self_type" : "type-4386",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4526",
-   "self_type" : "type-4525",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-4645",
-   "self_type" : "type-4644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2013",
-   "self_type" : "type-2012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3553",
-   "self_type" : "type-3552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4259",
-   "self_type" : "type-4258",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4356",
-   "self_type" : "type-4355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4545",
-   "self_type" : "type-4544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-4683",
-   "self_type" : "type-4682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3534",
-   "self_type" : "type-3533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3692",
-   "self_type" : "type-3691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4255",
-   "self_type" : "type-4254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-4323",
-   "self_type" : "type-4322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -21269,224 +19157,89 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3108",
+   "self_type" : "type-3107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3113",
-   "self_type" : "type-3112",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3509",
-   "self_type" : "type-3508",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3551",
-   "self_type" : "type-3550",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-3884",
-   "self_type" : "type-3883",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-4114",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4316",
-   "self_type" : "type-4315",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4406",
-   "self_type" : "type-4405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3102",
-   "self_type" : "type-3101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3875",
-   "self_type" : "type-3874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -21494,4949 +19247,35 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3105",
-   "self_type" : "type-3104",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-3877",
-   "self_type" : "type-3876",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-3957",
-   "self_type" : "type-3956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-4175",
-   "self_type" : "type-4174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3446",
-   "self_type" : "type-3445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3756",
-   "self_type" : "type-3755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4169",
-   "self_type" : "type-4168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-4664",
-   "self_type" : "type-4663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2761",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3616",
-   "self_type" : "type-3615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3613",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3669",
-   "self_type" : "type-3668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-3762",
-   "self_type" : "type-3761",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3758",
-   "self_type" : "type-3757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-3955",
-   "self_type" : "type-3954",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-4171",
-   "self_type" : "type-4170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3433",
-   "self_type" : "type-3432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3914",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4155",
-   "self_type" : "type-4154",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4285",
-   "self_type" : "type-4284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4431",
-   "self_type" : "type-4430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-4567",
-   "self_type" : "type-4566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2159",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1822",
-   "self_type" : "type-1821",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3359",
-   "self_type" : "type-3358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3518",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-3820",
-   "self_type" : "type-3819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4075",
-   "self_type" : "type-4074",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4240",
-   "self_type" : "type-4239",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4379",
-   "self_type" : "type-4378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-4635",
-   "self_type" : "type-4634",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3022",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3346",
-   "self_type" : "type-3345",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3506",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4059",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4227",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4371",
-   "self_type" : "type-4370",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4500",
-   "self_type" : "type-4499",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-4625",
-   "self_type" : "type-4624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1755",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4203",
-   "self_type" : "type-4202",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-4318",
-   "self_type" : "type-4317",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3429",
-   "self_type" : "type-3428",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4151",
-   "self_type" : "type-4150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4266",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-4728",
-   "self_type" : "type-4727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2711",
-   "self_type" : "type-2710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3184",
-   "self_type" : "type-3183",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3540",
-   "self_type" : "type-3539",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3602",
-   "self_type" : "type-3601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3731",
-   "self_type" : "type-3730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3920",
-   "self_type" : "type-3919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3949",
-   "self_type" : "type-3948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4004",
-   "self_type" : "type-4003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4159",
-   "self_type" : "type-4158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4289",
-   "self_type" : "type-4288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4439",
-   "self_type" : "type-4438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2305",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2295",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2076",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2063",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-2024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-3865",
-   "self_type" : "type-3864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-2088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2889",
-   "self_type" : "type-2888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3085",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3400",
-   "self_type" : "type-3399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3565",
-   "self_type" : "type-3564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3863",
-   "self_type" : "type-3862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4120",
-   "self_type" : "type-4119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4398",
-   "self_type" : "type-4397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4424",
-   "self_type" : "type-4423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4559",
-   "self_type" : "type-4558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4707",
-   "self_type" : "type-4706",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2503",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3398",
-   "self_type" : "type-3397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3563",
-   "self_type" : "type-3562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3858",
-   "self_type" : "type-3857",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3974",
-   "self_type" : "type-3973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4118",
-   "self_type" : "type-4117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4396",
-   "self_type" : "type-4395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4557",
-   "self_type" : "type-4556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1880",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3586",
-   "self_type" : "type-3585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3708",
-   "self_type" : "type-3707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3870",
-   "self_type" : "type-3869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3982",
-   "self_type" : "type-3981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4283",
-   "self_type" : "type-4282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4428",
-   "self_type" : "type-4427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-4563",
-   "self_type" : "type-4562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2891",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3275",
-   "self_type" : "type-3274",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3402",
-   "self_type" : "type-3401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3583",
-   "self_type" : "type-3582",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3706",
-   "self_type" : "type-3705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3868",
-   "self_type" : "type-3867",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-3979",
-   "self_type" : "type-3978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4123",
-   "self_type" : "type-4122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4281",
-   "self_type" : "type-4280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4426",
-   "self_type" : "type-4425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3070",
-   "self_type" : "type-3069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3377",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3435",
-   "self_type" : "type-3434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3675",
-   "self_type" : "type-3674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-3850",
-   "self_type" : "type-3849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4093",
-   "self_type" : "type-4092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4157",
-   "self_type" : "type-4156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4279",
-   "self_type" : "type-4278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4532",
-   "self_type" : "type-4531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-4536",
-   "self_type" : "type-4535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3017",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-3801",
-   "self_type" : "type-3800",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4223",
-   "self_type" : "type-4222",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4365",
-   "self_type" : "type-4364",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4495",
-   "self_type" : "type-4494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-4623",
-   "self_type" : "type-4622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3354",
-   "self_type" : "type-3353",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-3815",
-   "self_type" : "type-3814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4069",
-   "self_type" : "type-4068",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4235",
-   "self_type" : "type-4234",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4377",
-   "self_type" : "type-4376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4509",
-   "self_type" : "type-4508",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-4630",
-   "self_type" : "type-4629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3141",
-   "self_type" : "type-3140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3470",
-   "self_type" : "type-3469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3567",
-   "self_type" : "type-3566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4192",
-   "self_type" : "type-4191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4261",
-   "self_type" : "type-4260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4435",
-   "self_type" : "type-4434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4571",
-   "self_type" : "type-4570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-4712",
-   "self_type" : "type-4711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3145",
-   "self_type" : "type-3144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3427",
-   "self_type" : "type-3426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3909",
-   "self_type" : "type-3908",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-3996",
-   "self_type" : "type-3995",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4149",
-   "self_type" : "type-4148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4265",
-   "self_type" : "type-4264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4437",
-   "self_type" : "type-4436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1823",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3046",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3364",
-   "self_type" : "type-3363",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3524",
-   "self_type" : "type-3523",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-3827",
-   "self_type" : "type-3826",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4245",
-   "self_type" : "type-4244",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4381",
-   "self_type" : "type-4380",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4520",
-   "self_type" : "type-4519",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-4640",
-   "self_type" : "type-4639",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1740",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2916",
-   "self_type" : "type-2915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3279",
-   "self_type" : "type-3278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3686",
-   "self_type" : "type-3685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3724",
-   "self_type" : "type-3723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3879",
-   "self_type" : "type-3878",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4181",
-   "self_type" : "type-4180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4298",
-   "self_type" : "type-4297",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4308",
-   "self_type" : "type-4307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4402",
-   "self_type" : "type-4401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-4543",
-   "self_type" : "type-4542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1854",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2036",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3109",
-   "self_type" : "type-3108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3690",
-   "self_type" : "type-3689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3727",
-   "self_type" : "type-3726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4187",
-   "self_type" : "type-4186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4311",
-   "self_type" : "type-4310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4404",
-   "self_type" : "type-4403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4565",
-   "self_type" : "type-4564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4647",
-   "self_type" : "type-4646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3425",
-   "self_type" : "type-3424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-3994",
-   "self_type" : "type-3993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4147",
-   "self_type" : "type-4146",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4263",
-   "self_type" : "type-4262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4409",
-   "self_type" : "type-4408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-4717",
-   "self_type" : "type-4716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-3998",
-   "self_type" : "type-3997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3007",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4044",
-   "self_type" : "type-4043",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4213",
-   "self_type" : "type-4212",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4361",
-   "self_type" : "type-4360",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4483",
-   "self_type" : "type-4482",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-4613",
-   "self_type" : "type-4612",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-1759",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-4185",
-   "self_type" : "type-4184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-4143",
-   "self_type" : "type-4142",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-1930",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1999",
-   "self_type" : "type-1998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3159",
-   "self_type" : "type-3158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3383",
-   "self_type" : "type-3382",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3444",
-   "self_type" : "type-3443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3681",
-   "self_type" : "type-3680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3772",
-   "self_type" : "type-3771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3959",
-   "self_type" : "type-3958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4534",
-   "self_type" : "type-4533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-4539",
-   "self_type" : "type-4538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1737",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1848",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3385",
-   "self_type" : "type-3384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3450",
-   "self_type" : "type-3449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3684",
-   "self_type" : "type-3683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-3856",
-   "self_type" : "type-3855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4102",
-   "self_type" : "type-4101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4173",
-   "self_type" : "type-4172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4400",
-   "self_type" : "type-4399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-4541",
-   "self_type" : "type-4540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-3387",
    "self_type" : "type-3386",
    "size" : 4,
@@ -26444,296 +19283,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3558",
-   "self_type" : "type-3557",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4104",
-   "self_type" : "type-4103",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4145",
-   "self_type" : "type-4144",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4394",
-   "self_type" : "type-4393",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4412",
-   "self_type" : "type-4411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4548",
-   "self_type" : "type-4547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1842",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3012",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3336",
-   "self_type" : "type-3335",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3497",
-   "self_type" : "type-3496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4049",
-   "self_type" : "type-4048",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4217",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4363",
-   "self_type" : "type-4362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4489",
-   "self_type" : "type-4488",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-4618",
-   "self_type" : "type-4617",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -26741,10 +19346,7282 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3097",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3385",
+   "self_type" : "type-3384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-4104",
+   "self_type" : "type-4103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-4108",
+   "self_type" : "type-4107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3934",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-4102",
+   "self_type" : "type-4101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3366",
+   "self_type" : "type-3365",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4390",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4174",
+   "self_type" : "type-4173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4324",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-4110",
+   "self_type" : "type-4109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2953",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3095",
+   "self_type" : "type-3094",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3882",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4128",
+   "self_type" : "type-4127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4226",
+   "self_type" : "type-4225",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4361",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4235",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4520",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3085",
+   "self_type" : "type-3084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4381",
+   "self_type" : "type-4380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-4149",
+   "self_type" : "type-4148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-3958",
+   "self_type" : "type-3957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4352",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4032",
+   "self_type" : "type-4031",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4204",
+   "self_type" : "type-4203",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4342",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2907",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3414",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3703",
+   "self_type" : "type-3702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4137",
+   "self_type" : "type-4136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-2005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2864",
+   "self_type" : "type-2863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3945",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4397",
+   "self_type" : "type-4396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3944",
+   "self_type" : "type-3943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4370",
+   "self_type" : "type-4369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4258",
+   "self_type" : "type-4257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-3948",
+   "self_type" : "type-3947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4400",
+   "self_type" : "type-4399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4135",
+   "self_type" : "type-4134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4506",
+   "self_type" : "type-4505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2990",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4027",
+   "self_type" : "type-4026",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4199",
+   "self_type" : "type-4198",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4469",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1941",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4484",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3260",
+   "self_type" : "type-3259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4170",
+   "self_type" : "type-4169",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4546",
+   "self_type" : "type-4545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-4686",
+   "self_type" : "type-4685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4123",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4241",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4355",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4494",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3848",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4284",
+   "self_type" : "type-4283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4376",
+   "self_type" : "type-4375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1719",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4586",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-1730",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-4163",
+   "self_type" : "type-4162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4115",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-1901",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2785",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2957",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-3930",
+   "self_type" : "type-3929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-4513",
+   "self_type" : "type-4512",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3362",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3426",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4075",
+   "self_type" : "type-4074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4151",
+   "self_type" : "type-4150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4374",
+   "self_type" : "type-4373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4119",
+   "self_type" : "type-4118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4022",
+   "self_type" : "type-4021",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4194",
+   "self_type" : "type-4193",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4335",
+   "self_type" : "type-4334",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26752,8 +26629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26761,8 +26638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26770,8 +26647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26779,8 +26656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26788,96 +26665,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -26885,10 +26672,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26896,8 +26773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26905,8 +26782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26914,8 +26791,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-2508",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26923,8 +26800,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-2501",
-   "self_type" : "type-2505",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26932,8 +26809,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26941,8 +26818,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26950,8 +26827,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26959,8 +26836,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26968,8 +26845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-2502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26977,8 +26854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26986,8 +26863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26995,8 +26872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-938",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27004,8 +26881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27013,8 +26890,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27022,8 +26899,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27031,8 +26908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27049,8 +26926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27058,8 +26935,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27067,8 +26944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -27076,8 +26953,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27085,8 +26962,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27094,8 +26971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2210",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -27103,8 +26980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27112,8 +26989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -27121,8 +26998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -27130,8 +27007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -27139,8 +27016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -27148,8 +27025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -27157,8 +27034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27166,8 +27043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27175,8 +27052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27184,8 +27061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27193,8 +27070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -27202,8 +27079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -27211,8 +27088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27220,8 +27097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3060",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27229,8 +27106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3838",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-3809",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27238,8 +27115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27247,8 +27124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27256,8 +27133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27265,8 +27142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27274,8 +27151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27283,8 +27160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27292,8 +27169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2640",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27301,8 +27178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3066",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27310,8 +27187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27319,8 +27196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3394",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27328,8 +27205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3576",
-   "self_type" : "type-3579",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27337,8 +27214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3845",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3970",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27355,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4111",
-   "self_type" : "type-4113",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27364,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-44",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27373,8 +27250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4273",
-   "self_type" : "type-4275",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27382,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4418",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27391,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4555",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27400,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemory *",
    "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27409,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IMemoryHeap *",
    "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -27418,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27427,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3554",
-   "self_type" : "type-3556",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27445,8 +27322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27454,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27463,8 +27340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27472,8 +27349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27481,8 +27358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27490,8 +27367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27499,8 +27376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27508,8 +27385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -27517,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27526,26 +27403,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2204",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2199",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27553,8 +27430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27562,8 +27439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27571,8 +27448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27580,8 +27457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27589,8 +27466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27598,8 +27475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -27607,8 +27484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27616,8 +27493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27625,8 +27502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27634,8 +27511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27643,8 +27520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27652,8 +27529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27661,8 +27538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27670,8 +27547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27679,8 +27556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27688,8 +27565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27697,8 +27574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2054",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27706,8 +27583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27715,8 +27592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27724,8 +27601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3199",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27733,8 +27610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27742,8 +27619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3302",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27751,8 +27628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3440",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27760,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3606",
-   "self_type" : "type-3605",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27769,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27778,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3926",
-   "self_type" : "type-3925",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27787,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4010",
-   "self_type" : "type-4009",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27796,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4163",
-   "self_type" : "type-4162",
+   "referenced_type" : "type-4140",
+   "self_type" : "type-4139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27805,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4294",
-   "self_type" : "type-4293",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27814,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4442",
-   "self_type" : "type-4441",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27823,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4582",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27832,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27841,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27850,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27859,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27868,8 +27745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27877,8 +27754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27886,8 +27763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27895,8 +27772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27904,8 +27781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27913,8 +27790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27922,8 +27799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27931,8 +27808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27940,8 +27817,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27949,8 +27826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27958,8 +27835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27967,8 +27844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27976,8 +27853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27985,8 +27862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27994,8 +27871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28003,8 +27880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28012,8 +27889,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -28021,8 +27898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2243",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -28030,8 +27907,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28039,8 +27916,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-3082",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28048,8 +27925,35 @@
    "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-3859",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-3968",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28057,8 +27961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28066,8 +27970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3443",
+   "self_type" : "type-3445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28075,8 +27979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-4188",
-   "self_type" : "type-4190",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28084,8 +27988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28093,8 +27997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28102,8 +28006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-3852",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28111,8 +28015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28120,8 +28024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3559",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28129,8 +28033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28138,8 +28042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28147,8 +28051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28156,8 +28060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28165,8 +28069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28174,8 +28078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28183,8 +28087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28192,8 +28096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28201,8 +28105,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28210,8 +28114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28219,8 +28123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28228,8 +28132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28237,8 +28141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28246,141 +28150,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
-   "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXNode> *",
-   "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
-   "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
-   "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::NativeHandle> *",
-   "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "referenced_type" : "type-2521",
    "self_type" : "type-2523",
    "size" : 4,
@@ -28388,10 +28157,145 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
+   "name" : "const android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXNode> *",
+   "name" : "const android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOMXObserver> *",
+   "name" : "const android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
+   "name" : "const android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28399,8 +28303,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28408,8 +28312,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28417,8 +28321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-937",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28426,8 +28330,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28435,8 +28339,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28444,8 +28348,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-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28453,8 +28357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28462,8 +28366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28471,8 +28375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28480,26 +28384,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28507,8 +28402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28516,8 +28411,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28525,8 +28420,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28534,8 +28429,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28543,8 +28438,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28552,8 +28447,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-1923",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28561,8 +28456,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-3210",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3187",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28570,8 +28465,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-3321",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-3298",
+   "self_type" : "type-3300",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28579,8 +28474,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-3934",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3908",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28588,8 +28483,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-4032",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28597,8 +28492,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-4461",
-   "self_type" : "type-4463",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28606,8 +28501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28615,8 +28510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28624,8 +28519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -28633,8 +28528,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28642,8 +28537,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -28651,8 +28546,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28660,8 +28555,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -28669,8 +28564,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28678,8 +28573,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28687,8 +28582,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -28697,7 +28592,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -28706,7 +28601,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -28714,8 +28609,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28723,8 +28618,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28732,8 +28627,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -28741,8 +28636,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -28754,8 +28649,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28764,8 +28659,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28774,8 +28669,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -28784,8 +28679,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28794,8 +28689,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28804,8 +28699,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28814,8 +28709,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28824,8 +28719,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28834,8 +28729,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28844,8 +28739,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1898",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28854,8 +28749,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28864,8 +28759,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28874,8 +28769,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28884,8 +28779,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28894,8 +28789,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28904,8 +28799,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2931",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-3155",
+   "self_type" : "type-3159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28914,8 +28809,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28924,8 +28819,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3298",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28934,8 +28829,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3436",
-   "self_type" : "type-3438",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28944,8 +28839,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28954,8 +28849,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3603",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28964,8 +28859,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3661",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28974,8 +28869,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3730",
-   "self_type" : "type-3733",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28984,8 +28879,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3919",
-   "self_type" : "type-3921",
+   "referenced_type" : "type-3925",
+   "self_type" : "type-3924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28994,8 +28889,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-3947",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29004,8 +28899,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4003",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4136",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29014,8 +28909,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4158",
-   "self_type" : "type-4160",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29024,8 +28919,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4288",
-   "self_type" : "type-4290",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29034,8 +28929,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4438",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29044,8 +28939,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4577",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29054,8 +28949,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29064,8 +28959,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29074,8 +28969,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2183",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -29084,8 +28979,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29094,8 +28989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2314",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -29104,8 +28999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -29114,8 +29009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-69",
+   "self_type" : "type-2442",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -29124,8 +29019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29134,8 +29029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2188",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29144,8 +29039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29154,8 +29049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29164,8 +29059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29174,8 +29069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29184,8 +29079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-326",
+   "self_type" : "type-1875",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29194,8 +29089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -29204,8 +29099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29214,8 +29109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29224,8 +29119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -29234,8 +29129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29244,8 +29139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3058",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29254,8 +29149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3810",
+   "self_type" : "type-3809",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29264,8 +29159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29284,8 +29179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29294,8 +29189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29304,8 +29199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29314,8 +29209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29324,8 +29219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29334,8 +29229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2617",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29344,8 +29239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29354,8 +29249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3393",
-   "self_type" : "type-3392",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29374,8 +29269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3846",
-   "self_type" : "type-3845",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29384,8 +29279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3817",
+   "self_type" : "type-3816",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29394,8 +29289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4111",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29404,8 +29299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4274",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29414,8 +29309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29424,8 +29319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29434,8 +29329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4554",
-   "self_type" : "type-4553",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29444,8 +29339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29454,8 +29349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -29464,8 +29359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29474,8 +29369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29484,8 +29379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29494,8 +29389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29504,8 +29399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29514,8 +29409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29524,8 +29419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29534,8 +29429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3366",
-   "self_type" : "type-3365",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29544,8 +29439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3526",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29554,8 +29449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-3829",
-   "self_type" : "type-3828",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29564,8 +29459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4082",
-   "self_type" : "type-4081",
+   "referenced_type" : "type-4054",
+   "self_type" : "type-4053",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29574,8 +29469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4246",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29584,8 +29479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4384",
-   "self_type" : "type-4383",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29594,8 +29489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4496",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29604,8 +29499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29614,8 +29509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-2486",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2461",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29624,8 +29519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3555",
-   "self_type" : "type-3554",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4664",
+   "self_type" : "type-4663",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29644,8 +29539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29654,8 +29549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29664,8 +29559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2167",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29674,8 +29569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29684,8 +29579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29694,8 +29589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29704,8 +29599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29714,8 +29609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -29724,8 +29619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -29734,29 +29629,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2198",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2172",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -29764,8 +29659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29774,8 +29669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29784,8 +29679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29794,8 +29689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29804,8 +29699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29814,8 +29709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -29824,8 +29719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -29834,8 +29729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29844,8 +29739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29854,8 +29749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29864,18 +29759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1731",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29884,8 +29769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29894,8 +29779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29904,8 +29789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2799",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29914,8 +29799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3035",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29924,8 +29809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29934,8 +29819,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29944,8 +29829,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -29954,8 +29839,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-3817",
-   "self_type" : "type-3816",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29964,8 +29849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4072",
-   "self_type" : "type-4071",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29974,8 +29859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4237",
-   "self_type" : "type-4236",
+   "referenced_type" : "type-4211",
+   "self_type" : "type-4210",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -29984,8 +29869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4325",
-   "self_type" : "type-4324",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -29994,8 +29879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30004,8 +29889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4606",
+   "self_type" : "type-4605",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30014,18 +29899,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30034,8 +29929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30044,8 +29939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30054,8 +29949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30064,18 +29959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30084,8 +29969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30094,8 +29979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30104,8 +29989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30114,8 +29999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3802",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30124,8 +30009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4057",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4029",
+   "self_type" : "type-4028",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30134,8 +30019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4201",
+   "self_type" : "type-4200",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30144,8 +30029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4368",
-   "self_type" : "type-4367",
+   "referenced_type" : "type-4340",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30154,8 +30039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4497",
-   "self_type" : "type-4496",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30164,18 +30049,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2169",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-2536",
+   "referenced_type" : "type-825",
+   "self_type" : "type-2512",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30184,8 +30089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30194,8 +30099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30204,8 +30109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30214,8 +30119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30224,8 +30129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -30234,8 +30139,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30244,8 +30149,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30254,8 +30159,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30264,8 +30169,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30274,8 +30179,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30284,8 +30189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30294,8 +30199,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2744",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30304,8 +30209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30314,8 +30219,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30324,8 +30229,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30334,8 +30239,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3304",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30344,8 +30249,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3440",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30354,8 +30259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3607",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30364,8 +30269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3748",
-   "self_type" : "type-3747",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30374,8 +30279,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3927",
-   "self_type" : "type-3926",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3897",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30384,8 +30289,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30394,8 +30299,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4164",
-   "self_type" : "type-4163",
+   "referenced_type" : "type-4141",
+   "self_type" : "type-4140",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30404,8 +30309,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30414,8 +30319,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4443",
-   "self_type" : "type-4442",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30424,8 +30329,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4584",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30434,8 +30339,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30444,8 +30349,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30454,8 +30359,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30464,8 +30369,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30474,8 +30379,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30484,8 +30389,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30494,8 +30399,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-841",
+   "self_type" : "type-2053",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30504,8 +30409,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30514,8 +30419,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-838",
+   "self_type" : "type-2040",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30524,8 +30429,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30534,8 +30439,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30544,8 +30449,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30554,8 +30459,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30564,8 +30469,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30574,8 +30479,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30584,8 +30489,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30594,8 +30499,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30604,8 +30509,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30614,8 +30519,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-272",
+   "self_type" : "type-2024",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30624,8 +30529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30634,8 +30539,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30644,8 +30549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2239",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -30654,8 +30559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30664,8 +30569,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30674,8 +30579,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30684,8 +30589,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30694,8 +30599,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30704,8 +30609,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30714,8 +30619,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3305",
+   "self_type" : "type-3304",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30724,8 +30629,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30734,8 +30639,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3758",
+   "self_type" : "type-3757",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30744,8 +30649,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4039",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30754,8 +30659,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4210",
-   "self_type" : "type-4209",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30764,8 +30669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4358",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4330",
+   "self_type" : "type-4329",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30774,8 +30679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4480",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30784,8 +30689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-4610",
-   "self_type" : "type-4609",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30794,8 +30699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30804,8 +30709,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30814,8 +30719,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-3083",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30824,8 +30729,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-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30834,8 +30739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30844,8 +30749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30854,18 +30759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1748",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -30874,8 +30769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30884,8 +30779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
@@ -30894,8 +30789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30904,8 +30799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30914,8 +30809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3511",
-   "self_type" : "type-3510",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -30924,118 +30819,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-3809",
-   "self_type" : "type-3808",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4063",
-   "self_type" : "type-4062",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4232",
-   "self_type" : "type-4231",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4338",
-   "self_type" : "type-4337",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2995",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-3380",
-   "self_type" : "type-3379",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_string",
-   "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-3779",
    "self_type" : "type-3778",
    "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4034",
+   "self_type" : "type-4033",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4206",
+   "self_type" : "type-4205",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4311",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-4573",
+   "self_type" : "type-4572",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4096",
-   "self_type" : "type-4095",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -31044,8 +30899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-4341",
-   "self_type" : "type-4340",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1751",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31054,8 +30909,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-3750",
+   "self_type" : "type-3749",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4314",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_string",
+   "name" : "const android::hardware::hidl_string",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -31064,8 +30969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31074,8 +30979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-4469",
-   "self_type" : "type-4468",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -31084,8 +30989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31094,8 +30999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-4331",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31104,8 +31009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31114,8 +31019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31124,8 +31029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31134,8 +31039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31144,8 +31049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31154,8 +31059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31164,8 +31069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31174,478 +31079,448 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3361",
-   "self_type" : "type-3360",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3520",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-3824",
-   "self_type" : "type-3823",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4076",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4241",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4335",
-   "self_type" : "type-4334",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4517",
-   "self_type" : "type-4516",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-4637",
-   "self_type" : "type-4636",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3030",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3351",
-   "self_type" : "type-3350",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3477",
-   "self_type" : "type-3476",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-3812",
-   "self_type" : "type-3811",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4198",
-   "self_type" : "type-4197",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4373",
-   "self_type" : "type-4372",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4506",
-   "self_type" : "type-4505",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-4627",
-   "self_type" : "type-4626",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3370",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-3834",
-   "self_type" : "type-3833",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4252",
-   "self_type" : "type-4251",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4389",
-   "self_type" : "type-4388",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4528",
-   "self_type" : "type-4527",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-4649",
-   "self_type" : "type-4648",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-4189",
-   "self_type" : "type-4188",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3014",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
    "referenced_type" : "type-3338",
    "self_type" : "type-3337",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4049",
+   "self_type" : "type-4048",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4217",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
+   "size" : 104,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3002",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4037",
+   "self_type" : "type-4036",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4347",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4481",
+   "self_type" : "type-4480",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3505",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4362",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3443",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
+   "referenced_type" : "type-4167",
+   "self_type" : "type-4166",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31654,8 +31529,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3498",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31664,38 +31539,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3797",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4052",
-   "self_type" : "type-4051",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4220",
-   "self_type" : "type-4219",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
-   "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4344",
-   "self_type" : "type-4343",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1755",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -31704,8 +31549,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4491",
-   "self_type" : "type-4490",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31714,8 +31559,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-4620",
-   "self_type" : "type-4619",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31724,8 +31569,98 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2987",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4024",
+   "self_type" : "type-4023",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4196",
+   "self_type" : "type-4195",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4317",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4467",
+   "self_type" : "type-4466",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-4594",
+   "self_type" : "type-4593",
+   "size" : 48,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
+   "name" : "const android::hardware::media::omx::V1_0::Message",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31734,8 +31669,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31744,8 +31679,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31754,8 +31689,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31764,8 +31699,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31774,8 +31709,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31784,8 +31719,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31794,8 +31729,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3301",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31804,8 +31739,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31814,8 +31749,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-3784",
-   "self_type" : "type-3783",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31824,8 +31759,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4037",
-   "self_type" : "type-4036",
+   "referenced_type" : "type-4010",
+   "self_type" : "type-4009",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31834,8 +31769,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31844,8 +31779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4352",
-   "self_type" : "type-4351",
+   "referenced_type" : "type-4327",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31854,8 +31789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4476",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31864,8 +31799,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-4607",
-   "self_type" : "type-4606",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31874,8 +31809,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -31884,8 +31819,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31894,8 +31829,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-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3047",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31904,8 +31839,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31914,8 +31849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31924,8 +31859,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31934,8 +31869,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4698",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31944,8 +31879,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31954,8 +31889,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1795",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31964,8 +31899,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31974,8 +31909,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1777",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31984,8 +31919,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31994,8 +31929,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32004,8 +31939,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32014,8 +31949,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32024,8 +31959,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32034,8 +31969,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32044,8 +31979,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1735",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32054,8 +31989,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32064,8 +31999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32074,8 +32009,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32084,8 +32019,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2982",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32094,8 +32029,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32104,8 +32039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32114,8 +32049,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3648",
-   "self_type" : "type-3647",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32124,8 +32059,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32134,8 +32069,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4045",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32144,8 +32079,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4215",
-   "self_type" : "type-4214",
+   "referenced_type" : "type-4191",
+   "self_type" : "type-4190",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32154,8 +32089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4327",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -32164,8 +32099,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32174,8 +32109,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4589",
+   "self_type" : "type-4588",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32184,8 +32119,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -32194,8 +32129,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -32203,24 +32138,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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-3699",
-   "self_type" : "type-3698",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3669",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32228,18 +32155,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2305",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32248,8 +32183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32258,8 +32193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32268,8 +32203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32278,8 +32213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32288,8 +32223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32298,8 +32233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32308,8 +32243,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-909",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32318,8 +32253,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32328,8 +32263,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32338,8 +32273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32348,8 +32283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32358,8 +32293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32368,8 +32303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32378,8 +32313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-823",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32388,8 +32323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32398,8 +32333,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-2508",
-   "self_type" : "type-2514",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32408,8 +32343,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-2501",
-   "self_type" : "type-2506",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32418,8 +32353,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32428,8 +32363,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32438,8 +32373,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32448,8 +32383,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32458,8 +32393,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32468,8 +32403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32478,8 +32413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32488,8 +32423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32498,8 +32433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32508,8 +32443,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32518,8 +32453,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-566",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32528,8 +32463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32538,8 +32473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32548,8 +32483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32558,8 +32493,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32568,8 +32503,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -32578,28 +32513,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2191",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -32608,8 +32533,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32618,8 +32543,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32628,8 +32553,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32638,8 +32563,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -32648,8 +32573,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32658,8 +32583,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2297",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -32668,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1883",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32678,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32688,8 +32613,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32698,8 +32623,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32708,8 +32633,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-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32718,8 +32643,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-3211",
-   "self_type" : "type-3210",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32728,8 +32653,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-3322",
-   "self_type" : "type-3321",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32738,8 +32663,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-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32748,8 +32673,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-4033",
-   "self_type" : "type-4032",
+   "referenced_type" : "type-4007",
+   "self_type" : "type-4006",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32758,8 +32683,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-4462",
-   "self_type" : "type-4461",
+   "referenced_type" : "type-4436",
+   "self_type" : "type-4435",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32768,8 +32693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-1927",
-   "self_type" : "type-1926",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32778,8 +32703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-4465",
-   "self_type" : "type-4464",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -32788,8 +32713,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32798,8 +32723,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32808,8 +32733,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-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32818,8 +32743,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-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32828,8 +32753,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-3318",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32838,8 +32763,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-3924",
-   "self_type" : "type-3923",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32848,8 +32773,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-4029",
-   "self_type" : "type-4028",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4001",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -32858,18 +32783,48 @@
    "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-4458",
-   "self_type" : "type-4457",
+   "referenced_type" : "type-4432",
+   "self_type" : "type-4431",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3351",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32879,7 +32834,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32888,8 +32843,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32898,8 +32853,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1888",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32907,8 +32862,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -32916,8 +32871,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -32945,13 +32900,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2101",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -32977,18 +32932,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2141",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -33019,18 +32974,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2152",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -33061,23 +33016,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -33103,17 +33058,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -33123,13 +33078,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -33155,13 +33110,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2234"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -33187,28 +33142,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -33234,13 +33189,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -33266,17 +33221,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -33296,12 +33251,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -33326,8 +33281,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1686",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -33358,13 +33313,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -33400,13 +33355,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "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_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -33457,8 +33412,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -33489,12 +33444,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -33504,8 +33459,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -33531,7 +33486,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -33546,7 +33501,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -33561,13 +33516,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1784"
+     "referenced_type" : "type-1765"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -33593,13 +33548,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2141",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -33625,13 +33580,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -33657,47 +33612,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -33712,13 +33667,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2230",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -33744,12 +33699,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2197"
     },
     {
      "field_name" : "nStereoWidening",
@@ -33759,8 +33714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -33786,18 +33741,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -33823,18 +33778,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1687"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2010",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -33895,23 +33850,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2230"
+     "referenced_type" : "type-2205"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2229"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -33952,8 +33907,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -33989,23 +33944,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2251"
+     "referenced_type" : "type-2226"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2252"
+     "referenced_type" : "type-2227"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2225"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -34036,12 +33991,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34056,23 +34011,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -34113,8 +34068,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -34145,28 +34100,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2243"
+     "referenced_type" : "type-2218"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -34197,13 +34152,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2245"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -34234,18 +34189,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -34271,18 +34226,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -34308,18 +34263,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -34345,18 +34300,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -34392,23 +34347,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -34439,23 +34394,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -34501,18 +34456,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2227"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -34543,17 +34498,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -34568,18 +34523,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2196"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2200"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -34610,18 +34565,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -34652,18 +34607,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -34694,18 +34649,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -34736,13 +34691,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -34773,7 +34728,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34788,8 +34743,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -34825,7 +34780,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -34840,8 +34795,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -34902,13 +34857,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -34964,23 +34919,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2240"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -35011,12 +34966,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -35031,23 +34986,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -35078,18 +35033,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -35120,18 +35075,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -35187,23 +35142,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -35229,7 +35184,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -35239,12 +35194,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2234"
+     "referenced_type" : "type-2210"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2211"
     },
     {
      "field_name" : "nSamplingRate",
@@ -35254,12 +35209,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -35269,8 +35224,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -35281,28 +35236,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -35313,23 +35268,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -35355,8 +35310,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -35377,7 +35332,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -35397,32 +35352,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -35432,7 +35387,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -35452,8 +35407,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -35464,23 +35419,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -35491,18 +35446,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -35523,108 +35478,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -35650,12 +35605,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -35670,13 +35625,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2275"
+     "referenced_type" : "type-2250"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -35687,27 +35642,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2273"
+     "referenced_type" : "type-2248"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -35718,23 +35673,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -35770,8 +35725,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2492",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -35792,13 +35747,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -35829,8 +35784,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -35856,12 +35811,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -35871,8 +35826,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -35903,13 +35858,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2339"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -35935,18 +35890,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2283"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2264"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -35972,7 +35927,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -35987,8 +35942,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -36024,8 +35979,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -36046,7 +36001,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36061,8 +36016,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -36083,7 +36038,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -36103,18 +36058,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -36140,13 +36095,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -36172,13 +36127,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -36204,13 +36159,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -36236,12 +36191,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -36251,7 +36206,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -36261,7 +36216,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -36271,13 +36226,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -36303,53 +36258,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -36380,8 +36335,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -36407,13 +36362,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2394",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -36439,13 +36394,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2480",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -36471,13 +36426,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2292"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -36503,13 +36458,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -36535,13 +36490,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -36572,13 +36527,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -36604,13 +36559,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -36631,7 +36586,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36646,8 +36601,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -36668,7 +36623,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -36683,12 +36638,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -36698,17 +36653,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -36723,13 +36678,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -36755,13 +36710,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2355"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -36797,8 +36752,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -36824,18 +36779,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -36861,12 +36816,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -36881,8 +36836,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -36908,13 +36863,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -36940,13 +36895,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2512",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2490",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -36972,18 +36927,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -37009,13 +36964,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2530"
+     "referenced_type" : "type-2506"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2507",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -37041,13 +36996,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2407"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -37083,8 +37038,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -37110,7 +37065,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -37125,8 +37080,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -37152,13 +37107,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -37184,23 +37139,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -37231,18 +37186,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -37273,8 +37228,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -37300,18 +37255,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -37322,12 +37277,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -37342,7 +37297,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -37352,28 +37307,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -37384,18 +37339,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -37421,13 +37376,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -37448,13 +37403,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -37475,8 +37430,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -37502,7 +37457,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2164"
+     "referenced_type" : "type-2136"
     },
     {
      "field_name" : "nDataSize",
@@ -37512,13 +37467,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -37549,13 +37504,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -37566,13 +37521,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -37598,13 +37553,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -37625,13 +37580,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -37652,13 +37607,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -37679,13 +37634,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -37748,13 +37703,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -37780,58 +37735,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -37857,7 +37812,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -37867,8 +37822,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -37899,8 +37854,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -37921,12 +37876,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -37936,7 +37891,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -37946,18 +37901,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -37983,7 +37938,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -38003,27 +37958,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -38033,8 +37988,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -38045,27 +38000,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -38096,18 +38051,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2342"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -38128,13 +38083,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -38155,13 +38110,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -38192,8 +38147,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -38224,8 +38179,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -38256,8 +38211,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -38278,13 +38233,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -38305,13 +38260,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -38332,17 +38287,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -38352,8 +38307,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -38379,23 +38334,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -38416,13 +38371,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -38443,13 +38398,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -38475,13 +38430,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -38507,38 +38462,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -38554,13 +38509,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -38646,8 +38601,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -38673,7 +38628,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38688,18 +38643,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38735,8 +38690,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -38767,8 +38722,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -38799,8 +38754,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -38826,7 +38781,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -38851,8 +38806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -38878,7 +38833,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -38893,7 +38848,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -38908,18 +38863,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -38950,7 +38905,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -38960,7 +38915,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -38975,8 +38930,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -39012,13 +38967,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -39059,7 +39014,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -39079,32 +39034,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39114,22 +39069,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -39139,17 +39094,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -39159,13 +39114,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -39191,17 +39146,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -39223,8 +39178,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -39250,12 +39205,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -39265,12 +39220,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -39312,17 +39267,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39332,7 +39287,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -39347,8 +39302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -39374,12 +39329,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -39389,8 +39344,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -39416,7 +39371,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -39436,8 +39391,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -39463,33 +39418,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -39525,7 +39480,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -39535,8 +39490,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -39567,12 +39522,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -39592,7 +39547,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -39607,12 +39562,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -39627,13 +39582,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -39664,12 +39619,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -39679,8 +39634,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -39721,8 +39676,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -39763,8 +39718,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -39790,22 +39745,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -39830,23 +39785,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -39872,43 +39827,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -39934,7 +39889,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -39954,8 +39909,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -39981,12 +39936,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -39996,13 +39951,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -40028,17 +39983,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -40053,13 +40008,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -40085,13 +40040,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -40102,12 +40057,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -40122,7 +40077,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -40142,28 +40097,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -40174,18 +40129,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -40211,18 +40166,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -40248,18 +40203,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -40285,38 +40240,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -40326,7 +40281,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40335,13 +40290,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -40365,19 +40320,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -40416,8 +40371,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-2465",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "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"
@@ -40426,8 +40381,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -40437,7 +40392,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40446,19 +40401,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -40470,13 +40425,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -40520,7 +40475,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40529,55 +40484,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -40619,18 +40574,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -40640,7 +40595,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40655,25 +40610,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -40684,8 +40639,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -40727,12 +40682,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -40742,13 +40697,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -40759,11 +40714,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -40771,35 +40726,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -40810,28 +40765,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -40841,7 +40796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -40850,25 +40805,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -40910,7 +40865,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -40927,8 +40882,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -40938,7 +40893,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -40947,20 +40902,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -41081,20 +41036,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -41289,20 +41244,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -41530,20 +41485,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -41795,20 +41750,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -42000,20 +41955,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2258"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2258" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -42165,20 +42120,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2278"
+     "referenced_type" : "type-2252"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2278" ],
+   "template_args" : [ "type-2252" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -42346,20 +42301,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -42527,20 +42482,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -42763,20 +42718,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -42928,20 +42883,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -43123,14 +43078,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2287"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -43287,14 +43242,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2281"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -43468,7 +43423,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43477,26 +43432,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -43585,28 +43540,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -43615,8 +43570,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -43625,8 +43580,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -43638,14 +43593,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -43671,7 +43626,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -43681,13 +43636,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -43713,12 +43668,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -43733,13 +43688,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -43760,7 +43715,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43785,18 +43740,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -43817,7 +43772,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -43842,18 +43797,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -43889,13 +43844,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -43921,13 +43876,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2287"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -43953,13 +43908,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -43969,11 +43924,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -43981,11 +43936,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -43993,11 +43948,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -44005,11 +43960,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -44017,11 +43972,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -44029,11 +43984,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -44041,11 +43996,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -44053,11 +44008,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -44065,8 +44020,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -44097,8 +44052,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -44109,17 +44064,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2313"
+     "referenced_type" : "type-2288"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2289"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -44130,15 +44085,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2290"
     }
    ],
    "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-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -44149,18 +44104,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -44171,48 +44126,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2291"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -44223,14 +44178,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -44359,14 +44314,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -44447,14 +44402,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -44534,14 +44489,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -44628,14 +44583,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -44738,13 +44693,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -44794,17 +44749,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -44814,17 +44769,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44834,17 +44789,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -44854,17 +44809,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -44874,17 +44829,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -44894,17 +44849,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -44914,17 +44869,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -44934,17 +44889,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -44954,17 +44909,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -44974,14 +44929,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44992,11 +44947,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -45004,11 +44959,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -45016,11 +44971,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -45028,11 +44983,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -45040,17 +44995,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -45058,17 +45013,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -45078,17 +45033,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -45098,17 +45053,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -45118,29 +45073,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2179" ],
+   "template_args" : [ "type-2151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -45148,18 +45103,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -45169,50 +45124,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -45221,17 +45176,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -45240,17 +45195,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -45261,26 +45216,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -45293,26 +45248,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -45325,17 +45280,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -45364,17 +45319,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -45403,17 +45358,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -45442,18 +45397,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -45461,15 +45416,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -45481,17 +45436,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -45520,17 +45475,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -45557,100 +45512,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -45660,7 +45531,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -45670,29 +45541,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -45702,18 +45583,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -45724,23 +45605,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -45751,7 +45632,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45776,13 +45657,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -45793,7 +45674,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -45823,13 +45704,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -45845,12 +45726,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -45865,8 +45746,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -45902,8 +45783,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -45915,14 +45796,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -45934,14 +45815,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2162"
+     "referenced_type" : "type-2134"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -45951,7 +45832,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -45960,20 +45841,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -45983,7 +45864,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -45992,44 +45873,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -46064,11 +45939,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -46077,61 +45975,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46143,25 +46041,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -46173,127 +46071,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -46518,8 +46416,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -46528,8 +46426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -46573,14 +46471,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -46622,13 +46520,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -46652,7 +46550,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -46676,13 +46574,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -46694,31 +46592,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -46730,8 +46628,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -46744,13 +46642,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -46762,14 +46660,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -46780,8 +46678,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -46817,14 +46715,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -46834,14 +46732,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -46851,8 +46749,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -46904,7 +46802,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -46919,8 +46817,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -46941,13 +46839,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -46959,14 +46857,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2140"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -46978,14 +46876,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -46997,14 +46895,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2144"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -47017,14 +46915,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -47064,8 +46962,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -47075,8 +46973,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -47086,8 +46984,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -47111,7 +47009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -47120,17 +47018,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2304" ],
+   "template_args" : [ "type-2280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -47325,7 +47223,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -47334,17 +47232,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2301" ],
+   "template_args" : [ "type-2277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -47574,14 +47472,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2191"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -47591,11 +47489,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2289" ],
+   "template_args" : [ "type-2260" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -47603,13 +47501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -47650,17 +47548,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -47708,17 +47606,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -47766,17 +47664,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -47824,17 +47722,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47882,17 +47780,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -47940,17 +47838,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -47998,17 +47896,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -48056,17 +47954,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48114,17 +48012,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -48172,17 +48070,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -48230,17 +48128,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -48288,17 +48186,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -48345,14 +48243,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -48424,13 +48322,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -48442,14 +48340,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -48461,14 +48359,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -48479,7 +48377,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -48488,62 +48386,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1894"
+     "referenced_type" : "type-1869"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2156"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2153"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -48648,23 +48546,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2304"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -48675,17 +48573,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -48730,17 +48628,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -48785,17 +48683,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -48842,7 +48740,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -48854,20 +48752,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -48919,13 +48817,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -48936,18 +48834,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2320"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -48958,18 +48856,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -48980,23 +48878,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -49006,14 +48904,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2149"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -49040,8 +48938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-2464",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -49050,8 +48948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -49060,85 +48958,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -49149,13 +49047,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2461"
+     "referenced_type" : "type-2436"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -49165,13 +49063,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2450"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -49181,13 +49079,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49197,13 +49095,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2421"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "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"
@@ -49213,13 +49111,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2443"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49229,13 +49127,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49245,13 +49143,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2413"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49261,13 +49159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2457"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49277,13 +49175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2429"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -49293,13 +49191,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2459"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -49309,13 +49207,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -49325,13 +49223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2427"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -49340,8 +49238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -49352,21 +49250,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -49375,21 +49273,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -49398,21 +49296,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -49421,21 +49319,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -49444,21 +49342,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -49467,21 +49365,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -49490,21 +49388,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -49513,21 +49411,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -49536,21 +49434,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -49559,21 +49457,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -49582,21 +49480,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -49605,21 +49503,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -49629,14 +49527,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -49648,14 +49546,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -49667,14 +49565,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -49686,14 +49584,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -49705,17 +49603,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -49725,26 +49623,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -49754,7 +49652,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-1805"
     }
    ],
    "fields" :
@@ -49762,13 +49660,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -49936,7 +49834,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -49944,13 +49842,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -50163,7 +50061,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -50171,13 +50069,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -50333,10 +50231,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -50345,44 +50243,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -50446,7 +50344,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -50481,11 +50379,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -50519,7 +50417,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -50528,31 +50426,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -50673,7 +50571,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -50681,18 +50579,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -50834,7 +50732,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1743"
+     "referenced_type" : "type-1717"
     }
    ],
    "fields" :
@@ -50842,13 +50740,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -50972,7 +50870,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -50980,13 +50878,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -51149,7 +51047,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -51157,13 +51055,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -51275,16 +51173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2344"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51292,16 +51190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2347"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51309,16 +51207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2372"
+     "referenced_type" : "type-2346"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51326,16 +51224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2348"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51343,220 +51241,220 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2371"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2370",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2375"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2364"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2363",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2363"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2362",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2365"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2362"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2361",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2366"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2365",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2349"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2350"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2352"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2353"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2354"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2353",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2345"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2344",
    "self_type" : "type-2344",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2346" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2349"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2340"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2339"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2338"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2324"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2325"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2330"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2320"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2321" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -51564,16 +51462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51581,16 +51479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51598,16 +51496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2357"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51615,16 +51513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51632,16 +51530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2358"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51649,16 +51547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2380"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51666,16 +51564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2359"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -51683,16 +51581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -51700,16 +51598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2363"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51717,16 +51615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2362"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -51734,16 +51632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2367"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2366",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51751,16 +51649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2366"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2365",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -51768,16 +51666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2368"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2367",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -51785,16 +51683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2365"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2364",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -51802,16 +51700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2369"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2368",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -51819,372 +51717,372 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2427"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2426"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2425"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2424"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2422"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2430"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2429"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2431"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2423"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2428"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2432"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2413"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2412"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2411"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2410"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2416"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2415"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2417"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2409"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2414"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2418"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2401"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2400",
    "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2400"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2399"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2398"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2396"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2404"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2403"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2405"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2397"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2402"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2406"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2388"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2387"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2386",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2386"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2385"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2391"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2390"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2392"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2384"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2389"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2393"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2375"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -52193,13 +52091,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2400"
+     "referenced_type" : "type-2374"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2373",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52210,13 +52108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2399"
+     "referenced_type" : "type-2373"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52227,13 +52125,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52244,13 +52142,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2378"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52261,13 +52159,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2377"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2376",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52278,13 +52176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2379"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2378",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52295,13 +52193,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2376"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52312,13 +52210,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2380"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2379",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -52329,16 +52227,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2358"
+     "referenced_type" : "type-2333"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52346,16 +52244,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2332"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -52363,16 +52261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2334"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -52380,16 +52278,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2335"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -52398,7 +52296,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -52408,11 +52306,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -52421,21 +52319,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52444,21 +52342,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -52467,21 +52365,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -52490,21 +52388,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -52513,21 +52411,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -52541,16 +52439,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -52569,8 +52467,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -52583,17 +52481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -52603,17 +52501,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -52623,17 +52521,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -52643,17 +52541,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -52663,17 +52561,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -52683,17 +52581,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -52703,17 +52601,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -52723,17 +52621,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -52743,17 +52641,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -52763,317 +52661,317 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-662"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "record_kind" : "class",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-259"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-235"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-802"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-641"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-438"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
+   "record_kind" : "class",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2519"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2258" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
   },
   {
@@ -53083,17 +52981,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-127" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
   },
   {
@@ -53103,17 +53001,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::sp<android::OMXNodeInstance>",
    "name" : "android::sp<android::OMXNodeInstance>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
+   "template_args" : [ "type-825" ],
    "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
   },
   {
@@ -53123,17 +53021,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
    "name" : "android::sp<android::OmxGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
+   "template_args" : [ "type-794" ],
    "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
   },
   {
@@ -53143,17 +53041,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2154"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2183" ],
+   "template_args" : [ "type-2155" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -53163,17 +53061,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2509"
+     "referenced_type" : "type-2485"
     }
    ],
    "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-2508",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2511" ],
+   "template_args" : [ "type-2487" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -53183,17 +53081,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2502"
+     "referenced_type" : "type-2477"
     }
    ],
    "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-2501",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2504" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -53203,17 +53101,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-40"
     }
    ],
    "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-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -53223,17 +53121,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-33"
     }
    ],
    "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-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -53243,17 +53141,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -53263,17 +53161,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2493"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2519" ],
+   "template_args" : [ "type-2495" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -53283,17 +53181,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -53303,17 +53201,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -53323,17 +53221,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -53343,17 +53241,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -53363,17 +53261,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -53383,17 +53281,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -53403,17 +53301,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -53423,223 +53321,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2489"
+     "referenced_type" : "type-2465"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2491" ],
+   "template_args" : [ "type-2467" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53649,283 +53547,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -53935,8 +53833,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -53946,327 +53844,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54276,8 +54174,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54287,327 +54185,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54617,8 +54515,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54628,338 +54526,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1708",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1699",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1652" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -54969,8 +54867,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -54980,250 +54878,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -55234,16 +55132,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -55251,16 +55149,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -55268,16 +55166,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -55285,16 +55183,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -55302,16 +55200,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -55319,16 +55217,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1859"
+     "referenced_type" : "type-1837"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55336,16 +55234,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -55353,16 +55251,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1829"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -55370,16 +55268,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -55387,16 +55285,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -55404,16 +55302,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -55421,16 +55319,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -55440,23 +55338,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -55466,23 +55364,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -55492,23 +55390,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -55518,23 +55416,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -55544,23 +55442,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -55570,23 +55468,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -55595,18 +55493,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -55622,18 +55520,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2123"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -55644,7 +55542,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2119"
     },
     {
      "field_name" : "num_planes",
@@ -55654,13 +55552,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -55671,48 +55569,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2117"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -55723,38 +55621,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2125"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -55765,18 +55663,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -55787,17 +55685,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -55817,13 +55715,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -55833,13 +55731,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -55850,35 +55748,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -55899,8 +55797,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -55911,43 +55809,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -55958,32 +55856,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -55993,13 +55891,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -56010,32 +55908,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -56045,13 +55943,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -56062,17 +55960,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -56102,13 +56000,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -56119,28 +56017,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -56152,8 +56050,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -56161,8 +56059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -56170,8 +56068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56179,8 +56077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56188,8 +56086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56197,8 +56095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -56206,8 +56104,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_softomx.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 0513ec7..0000000
--- a/Q/64/arm_armv8-a/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28757 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-483",
-   "self_type" : "type-485",
-   "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-461",
-   "self_type" : "type-465",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 2048,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-806",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-583",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-584",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-681",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-682",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-678",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long double",
-   "name" : "long double",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "__aeabi_memclr"
-  },
-  {
-   "name" : "__aeabi_memclr4"
-  },
-  {
-   "name" : "__aeabi_memclr8"
-  },
-  {
-   "name" : "__aeabi_memcpy"
-  },
-  {
-   "name" : "__aeabi_memcpy4"
-  },
-  {
-   "name" : "__aeabi_memcpy8"
-  },
-  {
-   "name" : "__aeabi_memmove"
-  },
-  {
-   "name" : "__aeabi_memmove4"
-  },
-  {
-   "name" : "__aeabi_memmove8"
-  },
-  {
-   "name" : "__aeabi_memset"
-  },
-  {
-   "name" : "__aeabi_memset4"
-  },
-  {
-   "name" : "__aeabi_memset8"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-690",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-688",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-815",
-   "return_type" : "type-30",
-   "self_type" : "type-815",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-1017"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1021"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-725"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-780",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    },
-    {
-     "referenced_type" : "type-840"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-840"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-727"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-738"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1001"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-986"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-746"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-750"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-769",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1012",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-837",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-743",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-869",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-686",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-665",
-   "self_type" : "type-675",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-438",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-490",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1029",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-992",
-   "self_type" : "type-991",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1013",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-726",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-834",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-967",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-494",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-737",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1010",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-734",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-869",
-   "self_type" : "type-976",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-799",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-815",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1031",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-447",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-458",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-991",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-730",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-728",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 80,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-726",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-979",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-834",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-477",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-766",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-758",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-778",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-450",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-985",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-1000",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-737",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1009",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-743",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-749",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-734",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "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-479",
-   "self_type" : "type-478",
-   "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-519",
-   "self_type" : "type-518",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-969",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-983",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-788",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-441",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-432",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-423",
-   "self_type" : "type-422",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-434",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-428",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-838",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-558"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-455"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-456"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-493"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-488"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-532"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-534"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-520"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-552"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-455"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-550"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-491"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-454"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-453"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-482"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-485"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-507"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-488"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-509"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-502"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-503"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-590"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-582"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-618"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-602"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-621"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-711"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-712"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-594"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-613"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-600"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-671"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-669"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-679"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-681"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-682"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-676"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-467"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-615"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-710"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-592"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-689"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-690"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-684"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-688"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-690"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-663"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-652"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-653"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-628"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-630"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-638"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-639"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-633"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-631"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-642"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-645"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-646"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-650"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-648"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-962",
-   "self_type" : "type-962",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 2088,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-567" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1018"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-813"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-810"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1016",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-565"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-959"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-946"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-944"
-    }
-   ],
-   "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-943",
-   "self_type" : "type-943",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-942"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-935"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-934",
-   "self_type" : "type-934",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-938"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-955"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-953"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-940"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-951"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-874"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-873"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-850" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-849" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-845" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-890"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-889"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-888",
-   "self_type" : "type-888",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-894"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-892"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-896"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-895",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-927"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-926",
-   "self_type" : "type-926",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-926"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-925",
-   "self_type" : "type-925",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-925"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-924",
-   "self_type" : "type-924",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-924"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-922"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-921",
-   "self_type" : "type-921",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-930"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-928"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-932"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-914"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-913"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-911"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-917"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-916"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-918"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-915"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-919"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-918",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-901"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-900"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-905"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-904",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-903"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-907"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-861"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-725"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-978"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-979" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-753",
-   "self_type" : "type-753",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-720",
-   "self_type" : "type-720",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1036",
-   "self_type" : "type-1036",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1023",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1034",
-   "self_type" : "type-1034",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1005",
-   "self_type" : "type-1005",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-683",
-   "self_type" : "type-683",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1028",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-1035",
-   "self_type" : "type-1035",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-1006",
-   "self_type" : "type-1006",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1007" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-724",
-   "self_type" : "type-724",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-936",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-423" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1022",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-897",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-802"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-804"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-800"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-808"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-776",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
index a217662..34eb0df 100644
--- a/Q/64/arm_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -38,16 +18,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 8
   },
   {
@@ -55,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -64,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 8
   },
   {
@@ -81,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 8
   },
   {
@@ -90,8 +70,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -100,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -110,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
@@ -120,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 4
   },
   {
@@ -130,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 8
   },
   {
@@ -140,66 +120,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -214,19 +239,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -234,6 +279,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -298,6 +355,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -318,11 +379,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -330,7 +427,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -338,6 +459,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -389,389 +522,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -781,10 +603,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -794,10 +616,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -807,10 +629,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -820,24 +642,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -847,10 +655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -860,24 +668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -887,37 +681,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -925,10 +701,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -936,8 +721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +730,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -958,7 +752,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -966,8 +760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -975,35 +769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1016,8 +783,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1025,8 +792,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1035,19 +802,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -1055,8 +822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1065,8 +832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -1075,8 +842,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -1089,92 +866,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1182,7 +875,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1192,39 +885,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1234,18 +937,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1256,23 +959,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/x86/source-based/libstagefright_omx.so.lsdump b/Q/64/x86/source-based/libstagefright_omx.so.lsdump
index 0193e2d..f0b38fe 100644
--- a/Q/64/x86/source-based/libstagefright_omx.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
    "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-1682",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1802",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2644",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2421",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -147,49 +147,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1984",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2714",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2697",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -197,8 +188,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2697",
+   "self_type" : "type-2696",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -206,98 +197,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2698",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2447",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2570",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -306,7 +216,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -315,7 +225,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -324,7 +234,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -333,7 +243,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -342,7 +252,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -351,7 +261,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -360,7 +270,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -369,7 +279,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -382,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -391,8 +301,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -401,24 +311,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -426,8 +336,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -435,8 +345,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1650",
    "size" : 4
   },
   {
@@ -444,8 +354,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -453,8 +363,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -462,8 +372,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -492,8 +402,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1655",
+   "self_type" : "type-1655",
    "size" : 4
   },
   {
@@ -502,8 +412,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -512,15 +422,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -943,10 +853,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1084,6 +994,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1422,6 +1335,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1430,9 +1347,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1472,10 +1405,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1685,7 +1614,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1759,8 +1688,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1837,8 +1766,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1891,8 +1820,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1989,8 +1918,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2480",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2035,8 +1964,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2085,8 +2014,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2135,8 +2064,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2177,8 +2106,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2243,8 +2172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2385,8 +2314,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2427,8 +2356,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2465,8 +2394,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2440,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2482,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2611,8 +2540,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2665,8 +2594,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2707,8 +2636,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2753,8 +2682,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2720,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2829,8 +2758,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2887,8 +2816,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2921,8 +2850,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2884,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2997,8 +2926,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3039,8 +2968,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3065,8 +2994,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3103,8 +3032,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3157,8 +3086,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2961",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2935",
+   "self_type" : "type-2935",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3399,8 +3328,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3445,8 +3374,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3551,8 +3480,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3593,8 +3522,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3619,8 +3548,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3797,11 +3726,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3871,8 +3800,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3937,8 +3866,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3971,8 +3900,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4017,8 +3946,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4087,8 +4016,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2933",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2912",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4153,8 +4082,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4203,8 +4132,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4245,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4295,8 +4224,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4337,8 +4266,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4531,8 +4460,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5229,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5391,8 +5320,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5433,8 +5362,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5471,8 +5400,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5509,8 +5438,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5551,8 +5480,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2977",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2956",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5589,8 +5518,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5619,8 +5548,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5665,8 +5594,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5707,8 +5636,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5757,8 +5686,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5720,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5825,8 +5754,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5863,8 +5792,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5901,8 +5830,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5935,8 +5864,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5973,8 +5902,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5956,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6053,8 +5982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6079,8 +6008,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6185,8 +6114,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6223,8 +6152,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6245,8 +6174,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6299,8 +6228,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6337,8 +6266,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6419,8 +6348,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6469,8 +6398,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6527,8 +6456,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6589,8 +6518,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6647,8 +6576,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6709,8 +6638,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6764,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6844,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6957,8 +6886,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7053,8 +6982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7119,8 +7048,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7209,8 +7138,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7267,8 +7196,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7309,8 +7238,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7347,8 +7276,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7373,8 +7302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7451,8 +7380,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7434,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7547,8 +7476,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7613,8 +7542,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3041",
-   "self_type" : "type-3041",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7655,8 +7584,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7713,8 +7642,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7668,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3100",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3074",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7765,8 +7694,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7811,8 +7740,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7857,8 +7786,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7887,8 +7816,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7945,8 +7874,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2932",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8011,8 +7940,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8045,8 +7974,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3073",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8111,8 +8040,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-3097",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3070",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8169,8 +8098,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-3098",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3072",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8191,8 +8120,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8209,65 +8138,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2902",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8306,8 +8184,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8344,8 +8222,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8374,8 +8252,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2872",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2841",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8396,8 +8274,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8430,11 +8308,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8456,8 +8334,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8483,8 +8361,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8501,8 +8379,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8519,8 +8397,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8545,8 +8423,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8587,8 +8465,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8649,11 +8527,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8753,8 +8631,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1937",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8779,8 +8657,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1950",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8821,8 +8699,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9063,8 +8941,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9093,8 +8971,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9123,8 +9001,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9165,8 +9043,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9203,8 +9081,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9229,8 +9107,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9247,8 +9125,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9277,8 +9155,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-1940",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9371,8 +9249,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9413,8 +9291,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1920",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9431,8 +9309,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9461,8 +9339,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9495,8 +9373,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9549,8 +9427,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9566,12 +9444,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9581,15 +9459,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9599,24 +9477,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9626,27 +9504,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9656,24 +9534,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9683,18 +9561,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9704,21 +9582,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9728,18 +9606,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9749,15 +9627,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9767,18 +9645,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9788,24 +9666,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9815,18 +9693,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9836,18 +9714,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9857,24 +9735,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9884,18 +9762,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9905,13 +9783,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -9920,12 +9798,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9935,12 +9813,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2043",
-   "return_type" : "type-67",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2023",
+   "return_type" : "type-60",
+   "self_type" : "type-2023",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -9950,27 +9828,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -9982,10 +9860,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -9996,10 +9874,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2811"
+     "referenced_type" : "type-2785"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10010,10 +9888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2818"
+     "referenced_type" : "type-2792"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10024,10 +9902,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10037,13 +9915,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10053,20 +9931,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10076,7 +9954,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10085,7 +9963,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10095,13 +9973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10111,26 +9989,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10140,16 +10018,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10159,16 +10037,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3160"
+     "referenced_type" : "type-3146"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10179,22 +10057,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-3142"
     },
     {
-     "referenced_type" : "type-3117"
+     "referenced_type" : "type-3091"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10205,10 +10083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10221,19 +10099,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10244,10 +10122,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10260,19 +10138,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10283,25 +10161,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10312,7 +10190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10327,13 +10205,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10344,13 +10222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10360,10 +10238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10374,16 +10252,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10394,7 +10272,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10403,7 +10281,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10413,13 +10291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10430,10 +10308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10444,13 +10322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10460,13 +10338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10476,16 +10354,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10496,7 +10374,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10505,7 +10383,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10516,7 +10394,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10525,7 +10403,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10535,16 +10413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10555,13 +10433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10572,10 +10450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10464,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,13 +10500,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10639,7 +10517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10648,7 +10526,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10659,19 +10537,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10682,13 +10560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10699,19 +10577,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10722,13 +10600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10739,19 +10617,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10761,7 +10639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10770,16 +10648,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10790,25 +10668,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10819,19 +10697,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10841,16 +10719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10861,13 +10739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10878,16 +10756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10897,22 +10775,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10923,19 +10801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10946,25 +10824,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10974,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -10989,7 +10867,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11000,22 +10878,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11026,22 +10904,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11052,19 +10930,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11074,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11087,13 +10965,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11102,10 +10980,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11115,10 +10993,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11127,7 +11005,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11137,10 +11015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11150,10 +11028,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11163,19 +11041,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11185,19 +11063,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11207,13 +11085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11223,13 +11101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11239,19 +11117,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11261,19 +11139,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11283,19 +11161,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11306,10 +11184,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11320,10 +11198,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11334,10 +11212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11346,13 +11224,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11361,13 +11239,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11376,10 +11254,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11388,13 +11266,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11403,19 +11281,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11425,10 +11303,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11438,10 +11316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11451,16 +11329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11472,7 +11350,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11482,10 +11360,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11495,13 +11373,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11511,13 +11389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11527,13 +11405,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11542,10 +11420,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11555,13 +11433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-2746"
+     "referenced_type" : "type-2720"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11571,13 +11449,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11587,13 +11465,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11603,13 +11481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-2750"
+     "referenced_type" : "type-2724"
     }
    ],
-   "return_type" : "type-3175",
+   "return_type" : "type-3163",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11619,13 +11497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11635,13 +11513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11651,10 +11529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11664,10 +11542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11677,13 +11555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11693,16 +11571,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2879"
+     "referenced_type" : "type-2852"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11712,10 +11590,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11725,13 +11603,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11741,13 +11619,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11757,10 +11635,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3178",
+   "return_type" : "type-3166",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11770,10 +11648,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3179",
+   "return_type" : "type-3167",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11783,13 +11661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3180",
+   "return_type" : "type-3168",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11799,16 +11677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2882"
+     "referenced_type" : "type-2856"
     }
    ],
-   "return_type" : "type-3181",
+   "return_type" : "type-3169",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11818,10 +11696,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3182",
+   "return_type" : "type-3170",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11831,13 +11709,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11847,13 +11725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11863,16 +11741,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3185",
+   "return_type" : "type-3173",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11882,13 +11760,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3186",
+   "return_type" : "type-3174",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11898,13 +11776,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3187",
+   "return_type" : "type-3175",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11914,13 +11792,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-3188",
+   "return_type" : "type-3176",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11930,13 +11808,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3189",
+   "return_type" : "type-3177",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11946,16 +11824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-3190",
+   "return_type" : "type-3178",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11965,13 +11843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-3192"
+     "referenced_type" : "type-3180"
     }
    ],
-   "return_type" : "type-3191",
+   "return_type" : "type-3179",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11981,10 +11859,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-3193",
+   "return_type" : "type-3181",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11994,13 +11872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3194",
+   "return_type" : "type-3182",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12010,16 +11888,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-3196"
+     "referenced_type" : "type-3184"
     }
    ],
-   "return_type" : "type-3195",
+   "return_type" : "type-3183",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12029,13 +11907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-3197",
+   "return_type" : "type-3185",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12045,13 +11923,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12061,13 +11939,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12077,16 +11955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12096,19 +11974,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-3201"
+     "referenced_type" : "type-3189"
     }
    ],
-   "return_type" : "type-3200",
+   "return_type" : "type-3188",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12118,13 +11996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3203"
+     "referenced_type" : "type-3191"
     }
    ],
-   "return_type" : "type-3202",
+   "return_type" : "type-3190",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12134,13 +12012,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3156"
+     "referenced_type" : "type-3130"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12150,13 +12028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3205"
+     "referenced_type" : "type-3193"
     }
    ],
-   "return_type" : "type-3204",
+   "return_type" : "type-3192",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12166,10 +12044,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12179,10 +12057,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12192,10 +12070,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12205,10 +12083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12218,10 +12096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12231,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3207"
+     "referenced_type" : "type-3195"
     }
    ],
-   "return_type" : "type-3206",
+   "return_type" : "type-3194",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12247,13 +12125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3209"
+     "referenced_type" : "type-3197"
     }
    ],
-   "return_type" : "type-3208",
+   "return_type" : "type-3196",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12263,13 +12141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-3210",
+   "return_type" : "type-3198",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12279,79 +12157,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3212"
+     "referenced_type" : "type-3200"
     }
    ],
-   "return_type" : "type-3211",
+   "return_type" : "type-3199",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12361,10 +12239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12374,10 +12252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12387,10 +12265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12400,20 +12278,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12423,7 +12301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12432,7 +12310,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12442,26 +12320,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12471,16 +12349,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12490,16 +12368,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3214"
+     "referenced_type" : "type-3202"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12509,19 +12387,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12531,19 +12409,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12553,13 +12431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2557"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12569,13 +12447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12585,16 +12463,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12604,7 +12482,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12613,16 +12491,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12632,16 +12510,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12651,22 +12529,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12676,13 +12554,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12691,7 +12569,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12701,10 +12579,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12714,19 +12592,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12736,19 +12614,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,19 +12636,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12780,13 +12658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12796,13 +12674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12812,19 +12690,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3215",
+   "return_type" : "type-3203",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12834,7 +12712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12843,7 +12721,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3216",
+   "return_type" : "type-3204",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12853,25 +12731,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3217",
+   "return_type" : "type-3205",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12881,16 +12759,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-3218",
+   "return_type" : "type-3206",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12900,16 +12778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3220"
+     "referenced_type" : "type-3208"
     }
    ],
-   "return_type" : "type-3219",
+   "return_type" : "type-3207",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12919,19 +12797,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3222"
+     "referenced_type" : "type-3210"
     }
    ],
-   "return_type" : "type-3221",
+   "return_type" : "type-3209",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12941,16 +12819,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3223",
+   "return_type" : "type-3211",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,13 +12838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-3224",
+   "return_type" : "type-3212",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12976,13 +12854,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-3225",
+   "return_type" : "type-3213",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12992,16 +12870,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2601"
+     "referenced_type" : "type-2575"
     },
     {
-     "referenced_type" : "type-3227"
+     "referenced_type" : "type-3215"
     }
    ],
-   "return_type" : "type-3226",
+   "return_type" : "type-3214",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13011,19 +12889,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-3229"
+     "referenced_type" : "type-3217"
     }
    ],
-   "return_type" : "type-3228",
+   "return_type" : "type-3216",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13033,16 +12911,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3231"
+     "referenced_type" : "type-3219"
     }
    ],
-   "return_type" : "type-3230",
+   "return_type" : "type-3218",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13052,22 +12930,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3233"
+     "referenced_type" : "type-3221"
     }
    ],
-   "return_type" : "type-3232",
+   "return_type" : "type-3220",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13077,13 +12955,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13092,7 +12970,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3234",
+   "return_type" : "type-3222",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,10 +12980,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-3235",
+   "return_type" : "type-3223",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13115,19 +12993,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3237"
+     "referenced_type" : "type-3225"
     }
    ],
-   "return_type" : "type-3236",
+   "return_type" : "type-3224",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3238",
+   "return_type" : "type-3226",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13156,19 +13034,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-3240"
+     "referenced_type" : "type-3228"
     }
    ],
-   "return_type" : "type-3239",
+   "return_type" : "type-3227",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,13 +13056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13194,13 +13072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13211,10 +13089,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13225,10 +13103,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13238,10 +13130,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13250,7 +13142,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13260,16 +13152,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13279,22 +13171,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2322"
+     "referenced_type" : "type-2311"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2325"
+     "referenced_type" : "type-2316"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13304,13 +13196,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13321,13 +13213,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13338,13 +13230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13354,10 +13246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13367,10 +13259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13380,10 +13272,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13393,10 +13285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13406,10 +13298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13420,16 +13312,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13440,16 +13332,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13460,16 +13352,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13480,19 +13372,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13503,19 +13395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13526,19 +13418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13549,19 +13441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13572,16 +13464,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13592,16 +13484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13612,16 +13504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13632,19 +13524,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13655,19 +13547,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13678,19 +13570,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13701,19 +13593,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13724,16 +13616,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13744,16 +13636,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13764,16 +13656,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13784,19 +13676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13807,19 +13699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13830,19 +13722,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13853,19 +13745,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13876,16 +13768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13896,16 +13788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13916,16 +13808,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13936,19 +13828,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13959,19 +13851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13982,19 +13874,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14005,19 +13897,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14028,16 +13920,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14048,16 +13940,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14068,16 +13960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14088,19 +13980,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14111,19 +14003,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14134,19 +14026,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14157,19 +14049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14180,16 +14072,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14200,16 +14092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14220,16 +14112,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14240,19 +14132,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14263,19 +14155,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14286,19 +14178,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14309,19 +14201,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14332,16 +14224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14352,16 +14244,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14372,16 +14264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14392,19 +14284,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14415,19 +14307,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14438,19 +14330,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14461,19 +14353,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14484,16 +14376,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14504,16 +14396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14524,16 +14416,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14544,19 +14436,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14567,19 +14459,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14590,19 +14482,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14613,19 +14505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14636,16 +14528,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14656,16 +14548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14676,16 +14568,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14696,19 +14588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14719,19 +14611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14742,19 +14634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14765,19 +14657,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14788,16 +14680,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14808,16 +14700,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14828,19 +14720,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14851,19 +14743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14874,19 +14766,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14897,19 +14789,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14920,16 +14812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14940,16 +14832,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14960,19 +14852,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14983,19 +14875,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15006,19 +14898,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15029,19 +14921,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15051,16 +14943,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15069,14 +14961,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15085,8 +14971,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15094,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15103,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15112,8 +14998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15121,8 +15007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15130,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15139,8 +15025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15148,8 +15034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15157,8 +15043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15166,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15175,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15184,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15193,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15202,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15211,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15220,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2608",
-   "self_type" : "type-2607",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15229,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
+   "referenced_type" : "type-2704",
+   "self_type" : "type-2703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15238,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15247,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2858",
+   "self_type" : "type-2857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15256,17 +15142,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2279",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15274,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15283,35 +15169,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2234",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15319,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15328,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15337,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15346,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15355,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15364,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15373,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15382,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15391,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15400,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15409,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15418,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15427,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2559",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15436,8 +15322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2733",
-   "self_type" : "type-2732",
+   "referenced_type" : "type-2706",
+   "self_type" : "type-2705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15445,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15454,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15463,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15472,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15481,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15490,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15499,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15508,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15517,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15526,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15544,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15553,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15562,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15571,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15580,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15589,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15598,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15607,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15616,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3105",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15625,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15670,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15679,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15688,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -15697,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -15706,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15715,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15724,564 +15610,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2301",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2646",
-   "self_type" : "type-2648",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2924",
-   "self_type" : "type-2926",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2017",
-   "self_type" : "type-2019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2583",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2792",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2914",
-   "self_type" : "type-2916",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2276",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2477",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2775",
-   "self_type" : "type-2777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2626",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2260",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2617",
-   "self_type" : "type-2619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2894",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16289,539 +15617,638 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2010",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2282",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2598",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2777",
+   "self_type" : "type-2779",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2783",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2765",
+   "self_type" : "type-2767",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2882",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2314",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2599",
-   "self_type" : "type-2601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-2748",
-   "self_type" : "type-2750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2589",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2027",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2595",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2797",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2919",
-   "self_type" : "type-2921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2013",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2786",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2911",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2653",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2808",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2929",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2271",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2472",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2603",
-   "self_type" : "type-2605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2769",
-   "self_type" : "type-2772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1984",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2256",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2457",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2613",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2889",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2888",
    "self_type" : "type-2891",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2247",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2447",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2600",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2752",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2852",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2595",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2854",
+   "self_type" : "type-2856",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-980",
    "self_type" : "type-982",
    "size" : 4,
@@ -16829,107 +16256,98 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1757",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1945",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2285",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1751",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2575",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2724",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-1990",
    "self_type" : "type-1992",
    "size" : 4,
@@ -16937,17 +16355,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2265",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-2464",
    "self_type" : "type-2466",
    "size" : 4,
@@ -16955,44 +16373,107 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2586",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2766",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2774",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2897",
-   "self_type" : "type-2899",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2896",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2418",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2759",
+   "self_type" : "type-2761",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2885",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -17000,10 +16481,424 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2001",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2909",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2440",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2878",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2227",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2587",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2730",
+   "self_type" : "type-2732",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1790",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2236",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2435",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2557",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2870",
+   "self_type" : "type-2873",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17011,8 +16906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17020,8 +16915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17029,8 +16924,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17038,8 +16933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17047,8 +16942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17056,8 +16951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17065,8 +16960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17074,8 +16969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17083,8 +16978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17092,8 +16987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -17101,8 +16996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17110,8 +17005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17119,8 +17014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17128,8 +17023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3156",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17137,8 +17032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17146,8 +17041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17155,8 +17050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -17164,8 +17059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17173,8 +17068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -17182,8 +17077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17200,8 +17095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17209,8 +17104,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17218,8 +17113,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17227,8 +17122,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17236,8 +17131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17245,8 +17140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17254,8 +17149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17263,8 +17158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17272,8 +17167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17281,17 +17176,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2718",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17299,8 +17212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17308,8 +17221,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17317,8 +17230,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17326,8 +17239,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17335,8 +17248,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17344,8 +17257,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17353,8 +17266,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17362,8 +17275,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-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17371,8 +17284,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-2739",
-   "self_type" : "type-2738",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17380,8 +17293,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17389,8 +17302,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17399,7 +17312,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17407,8 +17320,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -17419,8 +17332,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17428,8 +17341,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17437,26 +17350,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17464,8 +17377,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17473,8 +17386,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17482,8 +17395,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17491,8 +17404,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17500,8 +17413,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1921",
-   "self_type" : "type-1920",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17509,8 +17422,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17518,8 +17431,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17527,8 +17440,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17536,8 +17449,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17545,8 +17458,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2729",
-   "self_type" : "type-2728",
+   "referenced_type" : "type-2702",
+   "self_type" : "type-2701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17554,8 +17467,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17563,8 +17476,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17572,8 +17485,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17581,8 +17494,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17590,8 +17503,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -17599,8 +17512,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17608,8 +17521,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17617,150 +17530,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2325",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -17768,35 +17537,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -17804,11 +17609,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -17816,7 +17729,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17824,8 +17737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17833,8 +17746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17842,8 +17755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17851,8 +17764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17860,8 +17773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17869,8 +17782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17878,8 +17791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17887,8 +17800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17896,8 +17809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17905,8 +17818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17914,8 +17827,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2700",
+   "self_type" : "type-2699",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17923,8 +17836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17932,8 +17845,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17941,8 +17854,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17950,8 +17863,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17959,8 +17872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17968,8 +17881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17977,8 +17890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17986,8 +17899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17995,1329 +17908,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2610",
-   "self_type" : "type-2609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2754",
-   "self_type" : "type-2753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2886",
-   "self_type" : "type-2885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2078",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2702",
-   "self_type" : "type-2701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2805",
-   "self_type" : "type-2804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2928",
-   "self_type" : "type-2927",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2579",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -19325,170 +17915,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1709",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2572",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2223",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -19496,3536 +17978,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2173",
-   "self_type" : "type-2172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2543",
-   "self_type" : "type-2542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2700",
-   "self_type" : "type-2699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2070",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2492",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2779",
-   "self_type" : "type-2778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2908",
-   "self_type" : "type-2907",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2857",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2763",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2691",
-   "self_type" : "type-2690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2840",
-   "self_type" : "type-2839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3125",
-   "self_type" : "type-3124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2697",
-   "self_type" : "type-2696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2339",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2695",
-   "self_type" : "type-2694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2844",
-   "self_type" : "type-2843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1846",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2537",
-   "self_type" : "type-2536",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2812",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2625",
-   "self_type" : "type-2624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2486",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2637",
-   "self_type" : "type-2636",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2517",
-   "self_type" : "type-2516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2704",
-   "self_type" : "type-2703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2520",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2708",
-   "self_type" : "type-2707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2669",
-   "self_type" : "type-2668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2824",
-   "self_type" : "type-2823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2848",
-   "self_type" : "type-2847",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2177",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2519",
-   "self_type" : "type-2518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2654",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-2578",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-2747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2822",
-   "self_type" : "type-2821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3112",
-   "self_type" : "type-3111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -23033,10 +18041,4915 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1924",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2908",
+   "self_type" : "type-2907",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2768",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2881",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1710",
+   "self_type" : "type-1709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2823",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2795",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2725",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2787",
+   "self_type" : "type-2786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2791",
+   "self_type" : "type-2790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2454",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2610",
+   "self_type" : "type-2609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2467",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2897",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2430",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-2550",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-2721",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2789",
+   "self_type" : "type-2788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2629",
+   "self_type" : "type-2628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3086",
+   "self_type" : "type-3085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23044,8 +22957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23053,8 +22966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23062,8 +22975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23071,8 +22984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23080,96 +22993,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3042",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -23177,10 +23000,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23188,8 +23101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3154",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23197,8 +23110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23206,8 +23119,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-3130",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23215,8 +23128,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-3123",
-   "self_type" : "type-3127",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23224,8 +23137,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23233,8 +23146,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23242,8 +23155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23251,8 +23164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23260,8 +23173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-3148",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-3122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23269,8 +23182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23278,8 +23191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2960",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23287,8 +23200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-938",
+   "self_type" : "type-3120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23296,8 +23209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23305,8 +23218,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23314,8 +23227,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23323,8 +23236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23332,8 +23245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23341,8 +23254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23350,8 +23263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23359,8 +23272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1964",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -23368,8 +23281,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23377,8 +23290,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -23386,8 +23299,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -23395,8 +23308,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23404,8 +23317,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2938",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -23413,8 +23326,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -23422,8 +23335,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -23431,8 +23344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3067",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -23440,8 +23353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -23449,8 +23362,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23458,8 +23371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23467,8 +23380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2873",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2846",
+   "self_type" : "type-2847",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23476,8 +23389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23485,8 +23398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2723",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23494,8 +23407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -23503,8 +23416,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23512,8 +23425,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23521,8 +23434,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23530,8 +23443,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23539,8 +23452,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23548,96 +23461,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1746",
-   "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-2049",
-   "self_type" : "type-2052",
-   "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-2187",
-   "self_type" : "type-2189",
-   "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-2329",
-   "self_type" : "type-2331",
-   "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-2530",
-   "self_type" : "type-2532",
-   "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-2687",
-   "self_type" : "type-2689",
-   "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-2836",
-   "self_type" : "type-2838",
-   "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-42",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemory *",
-   "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemoryHeap *",
-   "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2698",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMXBufferSource *",
-   "name" : "const android::IOMXBufferSource *",
    "referenced_type" : "type-1715",
    "self_type" : "type-1717",
    "size" : 4,
@@ -23645,10 +23468,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
+   "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-2018",
+   "self_type" : "type-2020",
+   "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-2156",
+   "self_type" : "type-2158",
+   "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-2301",
+   "self_type" : "type-2304",
+   "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-2500",
+   "self_type" : "type-2502",
+   "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-2659",
+   "self_type" : "type-2661",
+   "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-2810",
+   "self_type" : "type-2812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemory *",
+   "name" : "const android::IMemory *",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemoryHeap *",
+   "name" : "const android::IMemoryHeap *",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMXBufferSource *",
+   "name" : "const android::IOMXBufferSource *",
+   "referenced_type" : "type-3081",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23656,8 +23569,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23665,8 +23578,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23674,8 +23587,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23683,8 +23596,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23692,8 +23605,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23701,8 +23614,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23710,8 +23623,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23719,8 +23632,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23728,8 +23641,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -23737,26 +23650,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2259",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2238",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23764,8 +23677,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23773,8 +23686,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23782,8 +23695,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23791,8 +23704,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23800,8 +23713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23809,8 +23722,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23818,8 +23731,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23827,8 +23740,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3159",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23836,8 +23749,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23845,8 +23758,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23854,8 +23767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23863,8 +23776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23872,8 +23785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23881,8 +23794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23890,8 +23803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23899,8 +23812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23908,8 +23821,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23917,8 +23830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23926,8 +23839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23935,8 +23848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23944,8 +23857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2718",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23953,8 +23866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23962,8 +23875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23971,8 +23884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23980,8 +23893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23989,8 +23902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2782",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2744",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23998,8 +23911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24007,8 +23920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24016,8 +23929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24025,8 +23938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24034,8 +23947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24043,8 +23956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24052,8 +23965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24061,8 +23974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24070,8 +23983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24079,8 +23992,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24088,8 +24001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24097,8 +24010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24106,8 +24019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24115,8 +24028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24124,8 +24037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24133,8 +24046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24142,8 +24055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24151,8 +24064,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24160,8 +24073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -24169,8 +24082,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24178,8 +24091,26 @@
    "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-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24187,8 +24118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24196,8 +24127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24205,8 +24136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24214,8 +24145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24223,8 +24154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24232,8 +24163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24241,8 +24172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24250,8 +24181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24259,8 +24190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24268,8 +24199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24277,8 +24208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24286,8 +24217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24295,8 +24226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24304,8 +24235,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24313,8 +24244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24322,8 +24253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24331,8 +24262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24340,8 +24271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24349,8 +24280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24358,8 +24289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
    "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24367,8 +24298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> *",
    "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24376,8 +24307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> *",
    "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24385,8 +24316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
    "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24394,8 +24325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24403,42 +24334,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "referenced_type" : "type-3136",
    "self_type" : "type-3137",
    "size" : 4,
@@ -24446,10 +24341,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-3128",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24457,8 +24388,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-80",
-   "self_type" : "type-81",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24466,8 +24397,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-73",
-   "self_type" : "type-74",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24475,8 +24406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24484,8 +24415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24493,8 +24424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-3149",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24502,8 +24433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24511,8 +24442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2990",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24520,8 +24451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-937",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24529,8 +24460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24538,8 +24469,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24547,8 +24478,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-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24556,8 +24487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24565,8 +24496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24574,8 +24505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24583,26 +24514,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24610,8 +24532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24619,8 +24541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24628,8 +24550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24637,8 +24559,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24646,8 +24568,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24655,8 +24577,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-2151",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24664,8 +24586,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-2250",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24673,8 +24595,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-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24682,8 +24604,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24691,8 +24613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24700,8 +24622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24709,8 +24631,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2762",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24718,8 +24640,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -24727,8 +24649,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24736,8 +24658,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24745,8 +24667,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24754,8 +24676,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24763,8 +24685,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -24773,7 +24695,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -24782,7 +24704,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24790,8 +24712,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24799,8 +24721,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24808,8 +24730,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24817,8 +24739,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -24830,8 +24752,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24840,8 +24762,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24850,8 +24772,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -24860,8 +24782,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24870,8 +24792,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24880,8 +24802,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24890,8 +24812,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24900,8 +24822,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24910,8 +24832,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24920,8 +24842,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24930,8 +24852,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24940,8 +24862,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24950,8 +24872,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24960,8 +24882,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24970,8 +24892,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2358",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24980,8 +24902,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24990,8 +24912,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25000,8 +24922,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25010,8 +24932,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2709",
-   "self_type" : "type-2711",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25020,8 +24942,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25030,8 +24952,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25040,8 +24962,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25050,8 +24972,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2303",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -25060,8 +24982,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25070,8 +24992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2934",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -25080,8 +25002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -25090,8 +25012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-69",
+   "self_type" : "type-3062",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -25100,8 +25022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3066",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25110,8 +25032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2339",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25120,8 +25042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25130,8 +25052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25140,8 +25062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2846",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25150,8 +25072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25160,8 +25082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2722",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2691",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25170,8 +25092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -25180,8 +25102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25190,8 +25112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25200,8 +25122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25210,8 +25132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25220,8 +25142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25230,8 +25152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25240,8 +25162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25250,8 +25172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25270,8 +25192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25280,8 +25202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25290,8 +25212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25300,8 +25222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25310,8 +25232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25320,8 +25242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25330,8 +25252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25340,8 +25262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3144",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25350,8 +25272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -25360,8 +25282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25370,8 +25292,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25380,8 +25302,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25390,8 +25312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25400,8 +25322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25410,8 +25332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25420,8 +25342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2616",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25430,8 +25352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25440,8 +25362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25450,8 +25372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25460,8 +25382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3108",
-   "self_type" : "type-3107",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25470,8 +25392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25480,8 +25402,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25490,8 +25412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25500,8 +25422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25510,8 +25432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2191",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25520,8 +25442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25530,8 +25452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25540,8 +25462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25550,8 +25472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -25560,29 +25482,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2252",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2237",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2218",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -25590,8 +25512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25600,8 +25522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25610,8 +25532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25620,8 +25542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25630,8 +25552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25640,8 +25562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25650,8 +25572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -25660,8 +25582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25670,8 +25592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25680,8 +25602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25690,18 +25612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -25710,8 +25622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25720,8 +25632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25730,8 +25642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25740,8 +25652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -25750,8 +25662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2791",
-   "self_type" : "type-2790",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25760,8 +25672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25770,18 +25682,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25790,8 +25712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25800,8 +25722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25810,8 +25732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25820,8 +25742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25830,8 +25752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2598",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25840,8 +25762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2628",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2750",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25850,28 +25772,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2213",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-825",
+   "self_type" : "type-3132",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25880,8 +25812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25890,8 +25822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25900,8 +25832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25910,8 +25842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25920,8 +25852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -25930,8 +25862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25940,8 +25872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25950,8 +25882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25960,8 +25892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25970,8 +25902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25980,8 +25912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25990,8 +25922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26000,8 +25932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26010,8 +25942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26020,8 +25952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2720",
-   "self_type" : "type-2719",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26030,8 +25962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26040,8 +25972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26050,8 +25982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26060,8 +25992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26070,8 +26002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -26080,8 +26012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26090,8 +26022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26100,8 +26032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26110,8 +26042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1894",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26120,8 +26052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26130,8 +26062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1883",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26140,8 +26072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26150,8 +26082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26160,8 +26092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26170,8 +26102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26180,8 +26112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -26190,8 +26122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26200,8 +26132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26210,8 +26142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26220,8 +26152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26230,8 +26162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-272",
+   "self_type" : "type-1876",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -26240,8 +26172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -26250,8 +26182,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -26260,8 +26192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2584",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -26270,8 +26202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26280,8 +26212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26290,8 +26222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26300,8 +26232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26310,8 +26242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26320,8 +26252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2618",
-   "self_type" : "type-2617",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2588",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26330,8 +26262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2759",
-   "self_type" : "type-2758",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26340,8 +26272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2893",
-   "self_type" : "type-2892",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26350,8 +26282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26360,8 +26292,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26370,8 +26302,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-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26380,8 +26312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26390,8 +26322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26400,8 +26332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26410,8 +26342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26420,8 +26352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26430,18 +26362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2597",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2569",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26450,8 +26372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2781",
-   "self_type" : "type-2780",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2756",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26460,18 +26382,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2881",
-   "self_type" : "type-2880",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26480,8 +26412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26490,8 +26422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26500,8 +26432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2572",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26510,8 +26442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26520,8 +26452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2723",
+   "self_type" : "type-2722",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -26530,8 +26462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-2588",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26540,8 +26472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26550,8 +26482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26560,8 +26492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26570,8 +26502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26580,8 +26512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26590,8 +26522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2495",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2464",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26600,8 +26532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26610,8 +26542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2796",
-   "self_type" : "type-2795",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26620,8 +26552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2920",
-   "self_type" : "type-2919",
+   "referenced_type" : "type-2895",
+   "self_type" : "type-2894",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26630,8 +26562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26640,18 +26572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26660,8 +26582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26670,8 +26592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26680,8 +26602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26690,8 +26612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26700,8 +26622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2785",
-   "self_type" : "type-2784",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26710,98 +26632,128 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2621",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2783",
+   "self_type" : "type-2782",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
    "referenced_type" : "type-2910",
    "self_type" : "type-2909",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2036",
-   "self_type" : "type-2035",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2505",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2651",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26810,8 +26762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26820,8 +26772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26830,8 +26782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26840,8 +26792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26850,8 +26802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26860,8 +26812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26870,8 +26822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2438",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26880,8 +26832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2604",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26890,8 +26842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26900,8 +26852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2877",
+   "self_type" : "type-2876",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26910,8 +26862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26920,8 +26872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26930,8 +26882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26940,8 +26892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26950,8 +26902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26960,8 +26912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26970,8 +26922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26980,8 +26932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2730",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26990,8 +26942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2890",
-   "self_type" : "type-2889",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27000,8 +26952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27010,8 +26962,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27020,8 +26972,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-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27030,8 +26982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27050,8 +27002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27060,8 +27012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27070,8 +27022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27080,8 +27032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27090,8 +27042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27100,8 +27052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27110,8 +27062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27120,8 +27072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27130,8 +27082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27140,8 +27092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27150,8 +27102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27160,8 +27112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27170,8 +27122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27180,8 +27132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2465",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2433",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27190,8 +27142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -27200,8 +27152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2765",
-   "self_type" : "type-2764",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27210,8 +27162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27220,8 +27172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27230,8 +27182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27239,16 +27191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -27256,18 +27200,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2952",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2925",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27276,8 +27228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27286,8 +27238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27296,8 +27248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27306,8 +27258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27316,8 +27268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27326,8 +27278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27336,8 +27288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3103",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27356,8 +27308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27366,8 +27318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27376,8 +27328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27386,8 +27338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3136",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27396,8 +27348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27406,8 +27358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27416,8 +27368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27426,8 +27378,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-3130",
-   "self_type" : "type-3136",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27388,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-3123",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27446,8 +27398,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27456,8 +27408,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27466,8 +27418,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27476,8 +27428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27486,8 +27438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27496,8 +27448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27506,8 +27458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27516,8 +27468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27526,8 +27478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27536,8 +27488,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27498,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-566",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27556,8 +27508,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3116",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27566,8 +27518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27576,8 +27528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27586,8 +27538,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27596,8 +27548,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27606,28 +27558,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27636,8 +27578,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27646,8 +27588,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27656,8 +27598,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27666,8 +27608,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27676,8 +27618,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1813",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27686,8 +27628,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2943",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2917",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -27696,8 +27638,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1796",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27706,8 +27648,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27716,8 +27658,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27668,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27736,8 +27678,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27746,8 +27688,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27756,8 +27698,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-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2714",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27766,8 +27708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -27776,8 +27718,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27786,8 +27728,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27796,8 +27738,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-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27806,8 +27748,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-2247",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27816,18 +27758,38 @@
    "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-2737",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2711",
+   "self_type" : "type-2710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27837,7 +27799,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27846,8 +27808,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27856,8 +27818,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1801",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27865,8 +27827,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -27874,8 +27836,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -27903,13 +27865,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1907",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -27935,18 +27897,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2096",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -27977,18 +27939,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1993",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -28019,23 +27981,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -28061,17 +28023,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -28081,13 +28043,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2453",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -28113,13 +28075,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2553"
+     "referenced_type" : "type-2528"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -28145,28 +28107,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -28192,13 +28154,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -28224,17 +28186,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -28254,12 +28216,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -28284,8 +28246,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -28316,13 +28278,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -28358,13 +28320,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -28415,8 +28377,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -28447,12 +28409,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -28462,8 +28424,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -28489,7 +28451,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -28504,7 +28466,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -28519,13 +28481,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1739"
+     "referenced_type" : "type-1720"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -28551,13 +28513,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1938",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -28583,13 +28545,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2644",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -28615,47 +28577,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -28670,13 +28632,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2515",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -28702,12 +28664,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "nStereoWidening",
@@ -28717,8 +28679,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -28744,18 +28706,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -28781,18 +28743,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -28853,23 +28815,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2387"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -28910,8 +28872,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -28947,23 +28909,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2480"
+     "referenced_type" : "type-2492"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2488"
+     "referenced_type" : "type-2499"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2469"
+     "referenced_type" : "type-2487"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -28994,12 +28956,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29014,23 +28976,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -29071,8 +29033,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -29103,28 +29065,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2440"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -29155,13 +29117,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2453"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -29192,18 +29154,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2472"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2482",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -29229,18 +29191,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-3017",
-   "self_type" : "type-3017",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3001",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -29266,18 +29228,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -29303,18 +29265,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2515",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -29350,23 +29312,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -29397,23 +29359,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -29459,18 +29421,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -29501,17 +29463,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -29526,18 +29488,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -29568,18 +29530,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -29610,18 +29572,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -29652,18 +29614,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -29694,13 +29656,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -29731,7 +29693,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29746,8 +29708,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -29783,7 +29745,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29798,8 +29760,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -29860,13 +29822,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2412"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -29922,23 +29884,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2414"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -29969,12 +29931,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29989,23 +29951,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -30036,18 +29998,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -30078,18 +30040,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -30145,23 +30107,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -30187,7 +30149,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -30197,12 +30159,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2400"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nSamplingRate",
@@ -30212,12 +30174,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -30227,8 +30189,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -30239,28 +30201,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -30271,23 +30233,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -30313,8 +30275,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -30335,7 +30297,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -30355,32 +30317,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -30390,7 +30352,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -30410,8 +30372,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -30422,23 +30384,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -30449,18 +30411,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -30481,108 +30443,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -30608,12 +30570,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -30628,13 +30590,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2671"
+     "referenced_type" : "type-2644"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2643",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -30645,27 +30607,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2663"
+     "referenced_type" : "type-2636"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2665"
+     "referenced_type" : "type-2638"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -30676,23 +30638,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -30728,8 +30690,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-3114",
-   "self_type" : "type-3114",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3088",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -30750,13 +30712,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -30787,8 +30749,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-3101",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3078",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -30814,12 +30776,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -30829,8 +30791,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -30861,13 +30823,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2961"
+     "referenced_type" : "type-2935"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2963",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2936",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -30893,18 +30855,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2713"
+     "referenced_type" : "type-2696"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2715"
+     "referenced_type" : "type-2698"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2712",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2695",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -30930,7 +30892,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -30945,8 +30907,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2926",
+   "self_type" : "type-2926",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -30982,8 +30944,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2932",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -31004,7 +30966,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31019,8 +30981,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -31041,7 +31003,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31061,18 +31023,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -31098,13 +31060,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-3094",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3071",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -31130,13 +31092,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -31162,13 +31124,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3061"
+     "referenced_type" : "type-3038"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3073",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3050",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -31194,12 +31156,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -31209,7 +31171,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -31219,7 +31181,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -31229,13 +31191,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -31261,53 +31223,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -31338,8 +31300,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -31365,13 +31327,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3029",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3014",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -31397,13 +31359,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3122",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3100",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -31429,13 +31391,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2933"
+     "referenced_type" : "type-2912"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2944",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2918",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -31461,13 +31423,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -31493,13 +31455,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-3144",
-   "self_type" : "type-3144",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3119",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -31530,13 +31492,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -31562,13 +31524,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -31589,7 +31551,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31604,8 +31566,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -31626,7 +31588,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31641,12 +31603,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -31656,17 +31618,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -31681,13 +31643,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -31713,13 +31675,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2977"
+     "referenced_type" : "type-2956"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2989",
-   "self_type" : "type-2989",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -31755,8 +31717,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3150",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3124",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -31782,18 +31744,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2998",
-   "self_type" : "type-2998",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2980",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -31819,12 +31781,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -31839,8 +31801,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-3007",
-   "self_type" : "type-3007",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2990",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -31866,13 +31828,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2969",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2946",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -31898,13 +31860,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3134",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3110",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -31930,18 +31892,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2888",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2872",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -31967,13 +31929,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-3152"
+     "referenced_type" : "type-3126"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3153",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3127",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -31999,13 +31961,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3041"
+     "referenced_type" : "type-3027"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3028",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -32041,8 +32003,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2964",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2937",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -32068,7 +32030,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -32083,8 +32045,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -32110,13 +32072,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -32142,23 +32104,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -32189,18 +32151,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -32231,8 +32193,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -32258,18 +32220,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -32280,12 +32242,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -32300,7 +32262,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -32310,28 +32272,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -32342,18 +32304,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -32379,13 +32341,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -32406,13 +32368,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -32433,8 +32395,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -32460,7 +32422,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2091"
+     "referenced_type" : "type-2071"
     },
     {
      "field_name" : "nDataSize",
@@ -32470,13 +32432,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -32507,13 +32469,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -32524,13 +32486,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -32556,13 +32518,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -32583,13 +32545,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -32610,13 +32572,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -32637,13 +32599,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -32706,13 +32668,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3018",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3002",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -32738,58 +32700,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -32815,7 +32777,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -32825,8 +32787,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3125",
+   "self_type" : "type-3125",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -32857,8 +32819,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -32879,12 +32841,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -32894,7 +32856,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -32904,18 +32866,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -32941,7 +32903,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -32961,27 +32923,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -32991,8 +32953,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -33003,27 +32965,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -33054,18 +33016,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-2937"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3060",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -33086,13 +33048,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -33113,13 +33075,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -33150,8 +33112,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -33182,8 +33144,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -33214,8 +33176,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -33236,13 +33198,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -33263,13 +33225,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -33290,17 +33252,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -33310,8 +33272,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -33337,23 +33299,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -33374,13 +33336,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -33401,13 +33363,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -33433,13 +33395,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -33465,38 +33427,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -33512,13 +33474,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -33604,8 +33566,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -33631,7 +33593,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33646,18 +33608,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33693,8 +33655,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -33725,8 +33687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -33757,8 +33719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -33784,7 +33746,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -33809,8 +33771,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -33836,7 +33798,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -33851,7 +33813,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33866,18 +33828,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33908,7 +33870,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -33918,7 +33880,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -33933,8 +33895,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -33970,13 +33932,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -34017,7 +33979,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -34037,32 +33999,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34072,22 +34034,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -34097,17 +34059,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -34117,13 +34079,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -34149,17 +34111,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -34181,8 +34143,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -34208,12 +34170,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -34223,12 +34185,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -34270,17 +34232,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34290,7 +34252,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -34305,8 +34267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -34332,12 +34294,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -34347,8 +34309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -34374,7 +34336,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -34394,8 +34356,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -34421,33 +34383,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -34483,7 +34445,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -34493,8 +34455,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -34525,12 +34487,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -34550,7 +34512,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -34565,12 +34527,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34585,13 +34547,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -34622,12 +34584,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -34637,8 +34599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -34679,8 +34641,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -34721,8 +34683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -34748,22 +34710,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -34788,23 +34750,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -34830,43 +34792,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -34892,7 +34854,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -34912,8 +34874,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -34939,12 +34901,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -34954,13 +34916,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -34986,17 +34948,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -35011,13 +34973,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -35043,13 +35005,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -35060,12 +35022,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -35080,7 +35042,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -35100,28 +35062,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -35132,18 +35094,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -35169,18 +35131,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -35206,18 +35168,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -35243,38 +35205,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -35284,7 +35246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35293,13 +35255,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -35323,19 +35285,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -35374,8 +35336,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-3087",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3061",
    "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"
@@ -35384,8 +35346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -35395,7 +35357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35404,19 +35366,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -35428,13 +35390,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -35478,7 +35440,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35487,55 +35449,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -35577,18 +35539,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -35598,7 +35560,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35613,25 +35575,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -35642,8 +35604,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -35685,12 +35647,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -35700,13 +35662,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -35717,11 +35679,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -35729,35 +35691,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -35768,28 +35730,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -35799,7 +35761,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35808,25 +35770,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3091",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3064",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -35868,7 +35830,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -35885,8 +35847,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -35896,7 +35858,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -35905,20 +35867,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -36039,20 +36001,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36247,20 +36209,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36488,20 +36450,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -36753,20 +36715,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -36958,20 +36920,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2686"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2717",
-   "self_type" : "type-2717",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2685",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2686" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -37123,20 +37085,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2684"
+     "referenced_type" : "type-2652"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2706",
-   "self_type" : "type-2706",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2684" ],
+   "template_args" : [ "type-2652" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -37304,20 +37266,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -37485,20 +37447,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -37721,20 +37683,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -37886,20 +37848,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -38081,14 +38043,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2717"
+     "referenced_type" : "type-2685"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2716",
-   "self_type" : "type-2716",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -38245,14 +38207,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2706"
+     "referenced_type" : "type-2670"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2705",
-   "self_type" : "type-2705",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2669",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -38426,7 +38388,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -38435,26 +38397,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -38543,28 +38505,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -38573,8 +38535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3096",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3069",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -38583,8 +38545,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -38596,14 +38558,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -38629,7 +38591,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -38639,13 +38601,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2929",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -38671,12 +38633,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -38691,13 +38653,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2957",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2930",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -38718,7 +38680,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38743,18 +38705,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -38775,7 +38737,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38800,18 +38762,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -38847,13 +38809,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2933",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -38879,13 +38841,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2934"
+     "referenced_type" : "type-2901"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2958",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2931",
+   "self_type" : "type-2931",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -38911,13 +38873,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2939",
+   "referenced_type" : "type-2913",
+   "self_type" : "type-2913",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -38927,11 +38889,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -38939,11 +38901,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -38951,11 +38913,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -38963,11 +38925,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -38975,11 +38937,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -38987,11 +38949,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -38999,11 +38961,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -39011,11 +38973,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -39023,8 +38985,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -39055,8 +39017,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2953",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2927",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -39067,17 +39029,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2935"
+     "referenced_type" : "type-2902"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2936"
+     "referenced_type" : "type-2903"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2901",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -39088,15 +39050,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2937"
+     "referenced_type" : "type-2904"
     }
    ],
    "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-2936",
-   "self_type" : "type-2936",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2903",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -39107,18 +39069,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2938",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2905",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -39129,48 +39091,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2937",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2904",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -39181,14 +39143,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -39317,14 +39279,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -39405,14 +39367,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -39492,14 +39454,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -39586,14 +39548,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -39696,13 +39658,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -39752,17 +39714,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -39772,17 +39734,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39792,17 +39754,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -39812,17 +39774,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39832,17 +39794,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -39852,17 +39814,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -39872,17 +39834,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -39892,17 +39854,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -39912,17 +39874,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -39932,14 +39894,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -39950,11 +39912,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -39962,11 +39924,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -39974,11 +39936,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -39986,11 +39948,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -39998,17 +39960,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -40016,17 +39978,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -40036,17 +39998,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -40056,17 +40018,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -40076,29 +40038,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2116"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2139" ],
+   "template_args" : [ "type-2117" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -40106,18 +40068,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -40127,50 +40089,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -40179,17 +40141,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -40198,17 +40160,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -40219,26 +40181,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -40251,26 +40213,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -40283,17 +40245,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -40322,17 +40284,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -40361,17 +40323,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -40400,18 +40362,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -40419,15 +40381,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -40439,17 +40401,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -40478,17 +40440,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -40515,100 +40477,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -40618,7 +40496,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -40628,29 +40506,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -40660,18 +40548,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -40682,23 +40570,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -40709,7 +40597,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40734,13 +40622,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -40751,7 +40639,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40781,13 +40669,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -40803,12 +40691,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -40823,8 +40711,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -40860,8 +40748,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -40873,14 +40761,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -40892,14 +40780,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2077"
+     "referenced_type" : "type-2055"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2076",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -40909,7 +40797,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -40918,20 +40806,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -40941,7 +40829,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -40950,44 +40838,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -41022,11 +40904,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -41035,61 +40940,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41101,25 +41006,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -41131,127 +41036,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -41476,8 +41381,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -41486,8 +41391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -41531,14 +41436,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -41580,13 +41485,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -41610,7 +41515,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -41634,13 +41539,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41652,31 +41557,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -41688,8 +41593,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -41702,13 +41607,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -41720,14 +41625,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -41738,8 +41643,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -41775,14 +41680,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -41792,14 +41697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -41809,8 +41714,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -41862,7 +41767,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -41877,8 +41782,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2948",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2922",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -41899,13 +41804,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2928",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -41917,14 +41822,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2095"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2094",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -41936,14 +41841,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -41955,14 +41860,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -41975,14 +41880,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -42022,8 +41927,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -42033,8 +41938,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -42044,8 +41949,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -42069,7 +41974,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -42078,17 +41983,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2800",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2833" ],
+   "template_args" : [ "type-2801" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -42283,7 +42188,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -42292,17 +42197,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2772",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2810" ],
+   "template_args" : [ "type-2773" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -42532,14 +42437,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -42549,11 +42454,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2724",
-   "self_type" : "type-2724",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2725" ],
+   "template_args" : [ "type-2694" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -42561,13 +42466,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -42608,17 +42513,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -42666,17 +42571,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -42724,17 +42629,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -42782,17 +42687,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42840,17 +42745,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -42898,17 +42803,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42956,17 +42861,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -43014,17 +42919,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43072,17 +42977,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43130,17 +43035,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -43188,17 +43093,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -43246,17 +43151,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -43303,14 +43208,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -43382,13 +43287,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2940",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2914",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -43400,14 +43305,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -43419,14 +43324,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -43437,7 +43342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43446,62 +43351,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1798"
+     "referenced_type" : "type-1776"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2156"
+     "referenced_type" : "type-2130"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -43606,23 +43511,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2951"
+     "referenced_type" : "type-2924"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2950",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2923",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -43633,17 +43538,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -43688,17 +43593,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -43743,17 +43648,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -43800,7 +43705,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -43812,20 +43717,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -43877,13 +43782,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2941"
+     "referenced_type" : "type-2915"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2919",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -43894,18 +43799,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2942"
+     "referenced_type" : "type-2916"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2941",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2915",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -43916,18 +43821,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2921",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -43938,23 +43843,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2920",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -43964,14 +43869,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2115"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -43998,8 +43903,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3058",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -44008,8 +43913,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3057",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -44018,85 +43923,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44107,13 +44012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3083"
+     "referenced_type" : "type-3056"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3055",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -44123,13 +44028,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3072"
+     "referenced_type" : "type-3045"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3071",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3044",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -44139,13 +44044,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3070"
+     "referenced_type" : "type-3043"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3069",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3042",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44155,13 +44060,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3067"
+     "referenced_type" : "type-3041"
     }
    ],
    "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-3066",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3040",
    "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"
@@ -44171,13 +44076,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3065"
+     "referenced_type" : "type-3037"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3036",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44187,13 +44092,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3058"
+     "referenced_type" : "type-3031"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44203,13 +44108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3060"
+     "referenced_type" : "type-3033"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3032",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44219,13 +44124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3079"
+     "referenced_type" : "type-3052"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3051",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44235,13 +44140,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3077"
+     "referenced_type" : "type-3049"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3076",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3048",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44251,13 +44156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3081"
+     "referenced_type" : "type-3054"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3080",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3053",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -44267,13 +44172,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3063"
+     "referenced_type" : "type-3035"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3062",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3034",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44283,13 +44188,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3075"
+     "referenced_type" : "type-3047"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3046",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -44298,8 +44203,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -44310,21 +44215,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -44333,21 +44238,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -44356,21 +44261,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -44379,21 +44284,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -44402,21 +44307,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -44425,21 +44330,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -44448,21 +44353,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -44471,21 +44376,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -44494,21 +44399,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -44517,21 +44422,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -44540,21 +44445,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -44563,21 +44468,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -44587,14 +44492,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -44606,14 +44511,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -44625,14 +44530,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -44644,14 +44549,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -44663,17 +44568,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -44683,26 +44588,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -44712,7 +44617,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2643"
+     "referenced_type" : "type-2626"
     }
    ],
    "fields" :
@@ -44720,13 +44625,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -44894,7 +44799,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -44902,13 +44807,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -45121,7 +45026,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -45129,13 +45034,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -45291,10 +45196,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -45303,44 +45208,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -45404,7 +45309,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -45439,11 +45344,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -45477,7 +45382,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -45486,31 +45391,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -45631,7 +45536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -45639,18 +45544,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -45792,7 +45697,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2565"
+     "referenced_type" : "type-2540"
     }
    ],
    "fields" :
@@ -45800,13 +45705,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2539",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -45930,7 +45835,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -45938,13 +45843,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -46107,7 +46012,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -46115,13 +46020,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -46233,16 +46138,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2992"
+     "referenced_type" : "type-2964"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2991",
-   "self_type" : "type-2991",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2963",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46250,271 +46155,271 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2995"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2994",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2994"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2993",
-   "self_type" : "type-2993",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2996"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2995",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2993"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2992",
-   "self_type" : "type-2992",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2997"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2996",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2986"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2985",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2985"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2984",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2987"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2986",
-   "self_type" : "type-2986",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2984"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2983",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2988"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2987",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2971"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2970",
-   "self_type" : "type-2970",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2972"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2971",
-   "self_type" : "type-2971",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2974"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2973",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2975"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2974",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2976"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2975",
-   "self_type" : "type-2975",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2967"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2966",
    "self_type" : "type-2966",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2968" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2966"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2965",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2968"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2967",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2965"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2964",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2969"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2968",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2960"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2959",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2959"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2958",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2961"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2960",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2958"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2957",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2962"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2961",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2944"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2943",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2945"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2944",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2948"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2947",
+   "self_type" : "type-2947",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2949"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2948",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2950"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2949",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2940"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2939",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2941" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -46522,16 +46427,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3001"
+     "referenced_type" : "type-2974"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-3000",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46539,16 +46444,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3000"
+     "referenced_type" : "type-2973"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2999",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2972",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46556,16 +46461,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3004"
+     "referenced_type" : "type-2977"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3003",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2976",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46573,16 +46478,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3003"
+     "referenced_type" : "type-2976"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3002",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2975",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46590,16 +46495,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3005"
+     "referenced_type" : "type-2978"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2977",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46607,16 +46512,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3002"
+     "referenced_type" : "type-2975"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2974",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46624,16 +46529,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3006"
+     "referenced_type" : "type-2979"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3005",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2978",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -46641,16 +46546,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3011"
+     "referenced_type" : "type-2984"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3010",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2983",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46658,16 +46563,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3010"
+     "referenced_type" : "type-2983"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2982",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46675,16 +46580,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3009"
+     "referenced_type" : "type-2982"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3008",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2981",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46692,16 +46597,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3014"
+     "referenced_type" : "type-2987"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2986",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46709,16 +46614,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3013"
+     "referenced_type" : "type-2986"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3012",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2985",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46726,16 +46631,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3015"
+     "referenced_type" : "type-2988"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3014",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2987",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46743,16 +46648,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3012"
+     "referenced_type" : "type-2985"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2984",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46760,101 +46665,101 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-2989"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<float>",
+   "name" : "android::is_one_of<float>",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2988",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-94" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3021"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3020",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3020"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3019",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3019"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3018",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3018"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3017",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-3016"
     }
    ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3015",
    "self_type" : "type-3015",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3049"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3048",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3048"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3047",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3047"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3046",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3046"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3045",
-   "self_type" : "type-3045",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3044"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3043",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46862,16 +46767,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3052"
+     "referenced_type" : "type-3024"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3051",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3023",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46879,270 +46784,270 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3051"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3050",
-   "self_type" : "type-3050",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3053"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3052",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3045"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3044",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3050"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3049",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3054"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3053",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3035"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3034",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3034"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3033",
-   "self_type" : "type-3033",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3033"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3032",
-   "self_type" : "type-3032",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3032"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3031",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3038"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3037",
-   "self_type" : "type-3037",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3037"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3036",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3039"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3038",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3031"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3030",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3036"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3035",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3040"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3039",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-3023"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3022",
    "self_type" : "type-3022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3025"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3024",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3017"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3016",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3022"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3021",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3026"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3025",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3008"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3007",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3007"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3006",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3006"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3005",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3005"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3004",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3011"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3010",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3010"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3009",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3012"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3011",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3004"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3003",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3009"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3008",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3013"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3012",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2995"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2994",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -47151,13 +47056,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3022"
+     "referenced_type" : "type-2994"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47168,13 +47073,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3021"
+     "referenced_type" : "type-2993"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3020",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2992",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47185,13 +47090,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3020"
+     "referenced_type" : "type-2992"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47202,13 +47107,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3026"
+     "referenced_type" : "type-2998"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47219,13 +47124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3025"
+     "referenced_type" : "type-2997"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3024",
-   "self_type" : "type-3024",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2996",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47236,13 +47141,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3027"
+     "referenced_type" : "type-2999"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2998",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47253,13 +47158,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3024"
+     "referenced_type" : "type-2996"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3023",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2995",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47270,13 +47175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3028"
+     "referenced_type" : "type-3000"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-3027",
-   "self_type" : "type-3027",
+   "referenced_type" : "type-2999",
+   "self_type" : "type-2999",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47287,16 +47192,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2980"
+     "referenced_type" : "type-2953"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2979",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2952",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47304,16 +47209,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2979"
+     "referenced_type" : "type-2952"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2978",
-   "self_type" : "type-2978",
+   "referenced_type" : "type-2951",
+   "self_type" : "type-2951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47321,16 +47226,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2981"
+     "referenced_type" : "type-2954"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2980",
-   "self_type" : "type-2980",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2953",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -47338,16 +47243,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2982"
+     "referenced_type" : "type-2955"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2981",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2954",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -47356,7 +47261,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -47366,11 +47271,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -47379,21 +47284,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47402,21 +47307,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -47425,21 +47330,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47448,21 +47353,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -47471,21 +47376,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -47499,16 +47404,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -47527,8 +47432,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -47541,17 +47446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -47561,17 +47466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -47581,17 +47486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -47601,17 +47506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -47621,17 +47526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -47641,17 +47546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -47661,17 +47566,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -47681,17 +47586,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -47701,17 +47606,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -47721,318 +47626,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
    "alignment" : 4,
@@ -48041,18 +47646,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-662"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
    "alignment" : 4,
@@ -48061,18 +47666,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-259"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
-   "name" : "android::sp<android::OMXNodeInstance>",
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
    "alignment" : 4,
@@ -48081,18 +47686,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
-   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
    "alignment" : 4,
@@ -48101,18 +47706,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2157"
+     "referenced_type" : "type-802"
     }
    ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2158" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
    "alignment" : 4,
@@ -48121,18 +47726,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3131"
+     "referenced_type" : "type-641"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3130",
-   "self_type" : "type-3130",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3133" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
    "alignment" : 4,
@@ -48141,78 +47746,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3124"
+     "referenced_type" : "type-438"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-3123",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3126" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "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-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
-    }
-   ],
-   "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-56",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
    "alignment" : 4,
@@ -48224,14 +47769,374 @@
      "referenced_type" : "type-3139"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
    "record_kind" : "class",
    "referenced_type" : "type-3138",
    "self_type" : "type-3138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3141" ],
+   "template_args" : [ "type-2686" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-125"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-127" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-824"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
+   "name" : "android::sp<android::OMXNodeInstance>",
+   "record_kind" : "class",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-825" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-797"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
+   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-794" ],
+   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Thread>",
+   "name" : "android::sp<android::Thread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2132" ],
+   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3105"
+    }
+   ],
+   "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-3104",
+   "self_type" : "type-3104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3107" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3097"
+    }
+   ],
+   "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-3096",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3099" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-40"
+    }
+   ],
+   "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-39",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-42" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-33"
+    }
+   ],
+   "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-32",
+   "self_type" : "type-32",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-476" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3113"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3115" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -48241,17 +48146,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -48261,17 +48166,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -48281,17 +48186,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -48301,17 +48206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -48321,17 +48226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -48341,17 +48246,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -48361,17 +48266,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -48381,223 +48286,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3111"
+     "referenced_type" : "type-3085"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3110",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3113" ],
+   "template_args" : [ "type-3087" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48607,283 +48512,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -48893,8 +48798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48904,327 +48809,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1686",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49234,8 +49139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49245,327 +49150,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1680",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1735",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1691",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49575,8 +49480,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49586,338 +49491,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1683",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-1876",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49927,8 +49832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49938,250 +49843,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1661",
+   "self_type" : "type-1661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -50192,16 +50097,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -50209,16 +50114,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -50226,16 +50131,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -50243,16 +50148,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -50260,16 +50165,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -50277,16 +50182,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-1748"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50294,16 +50199,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -50311,16 +50216,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1769"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50328,16 +50233,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -50345,16 +50250,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -50362,16 +50267,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -50379,16 +50284,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -50398,23 +50303,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -50424,23 +50329,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -50450,23 +50355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -50476,23 +50381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -50502,23 +50407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -50528,23 +50433,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -50553,18 +50458,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2017",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -50580,18 +50485,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1996"
+     "referenced_type" : "type-1984"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -50602,7 +50507,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-1954"
     },
     {
      "field_name" : "num_planes",
@@ -50612,13 +50517,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1981"
+     "referenced_type" : "type-1964"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -50629,48 +50534,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1970"
+     "referenced_type" : "type-1942"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -50681,38 +50586,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -50723,18 +50628,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -50745,17 +50650,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -50775,13 +50680,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -50791,13 +50696,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -50808,35 +50713,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -50857,8 +50762,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -50869,43 +50774,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -50916,32 +50821,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -50951,13 +50856,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -50968,32 +50873,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -51003,13 +50908,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -51020,17 +50925,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -51060,13 +50965,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -51077,28 +50982,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -51110,8 +51015,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -51119,8 +51024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -51128,8 +51033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51137,8 +51042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51146,8 +51051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51155,8 +51060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51164,8 +51069,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/x86/source-based/libstagefright_softomx.so.lsdump b/Q/64/x86/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 879ce36..0000000
--- a/Q/64/x86/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28465 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "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-447",
-   "self_type" : "type-448",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 1792,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-759",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-536",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-537",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-634",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-635",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-631",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-768",
-   "return_type" : "type-30",
-   "self_type" : "type-768",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-733",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-790"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-793"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-680"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-939"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-722",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-700",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-708",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-679",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-724",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-962",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-822",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-639",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-426",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-685",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-918",
-   "self_type" : "type-920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-711",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-690",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-936",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-768",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-683",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-681",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-679",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-932",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-787",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-454",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-711",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-731",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-439",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-938",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-953",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-690",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-696",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-702",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-687",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-922",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-729",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-979",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-618",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-741",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-428",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-424",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-766",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-511"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-465"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-463"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-460"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-485"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-487"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-484"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-478"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-480"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-482"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-505"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-506"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-461"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-443"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-442"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-459"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-469"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-470"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 416,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-535"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-537"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-571"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-555"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-539"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-547"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-622"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-632"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-634"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-635"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-629"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-450"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-568"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-569"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-577"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-642"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-643"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-637"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-641"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-605"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-606"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-581"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-583"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-591"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-592"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-584"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-595"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-596"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-598"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-599"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-603"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-601"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-915",
-   "self_type" : "type-915",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 1828,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-519"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-520" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-712"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-774"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-971"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-763"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-518"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-897"
-    }
-   ],
-   "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-896",
-   "self_type" : "type-896",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-888"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-887",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-908"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-825"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-828"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-827"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-829"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-818"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-820"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-817"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-800"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-803" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-801"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-802" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-807"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-808"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-797"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-798" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-833"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-832"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-835"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-834"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-843"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-842"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-846"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-845"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-849"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-878"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-877",
-   "self_type" : "type-877",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-870"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-869"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-871"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-863"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-852"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-857"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-856"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-812"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-811",
-   "self_type" : "type-811",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-813"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-814"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-764"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-765" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-932" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-985",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-940",
-   "self_type" : "type-940",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-861",
-   "self_type" : "type-861",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-636",
-   "self_type" : "type-636",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-959",
-   "self_type" : "type-959",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-677",
-   "self_type" : "type-677",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-750",
-   "self_type" : "type-750",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-755"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-757"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-753"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-729",
-   "self_type" : "type-935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/x86/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/x86/source-based/libstagefright_xmlparser.so.lsdump
index cb952d2..52edd3d 100644
--- a/Q/64/x86/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -37,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
@@ -46,8 +26,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -56,66 +36,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -130,19 +155,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -150,6 +195,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -214,6 +271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -234,11 +295,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -246,7 +343,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -254,6 +375,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -269,389 +402,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -661,10 +483,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -674,10 +496,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -687,10 +509,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -700,24 +522,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -727,10 +535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -740,24 +548,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -767,37 +561,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -805,10 +581,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -816,8 +601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -825,8 +610,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -838,7 +632,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -846,8 +640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -855,35 +649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -896,8 +663,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -905,8 +672,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -915,19 +682,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -935,8 +702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -955,8 +722,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -969,92 +746,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1062,7 +755,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1072,39 +765,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1114,18 +817,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1136,23 +839,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 1d12420..a698be2 100644
--- a/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47476,9 +47473,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48874,9 +48868,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55039,9 +55030,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56331,9 +56319,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60621,8 +60606,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-358",
    "self_type" : "type-358",
@@ -60645,8 +60630,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-351",
    "self_type" : "type-351",
@@ -60669,8 +60654,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-374",
    "self_type" : "type-374",
@@ -60783,8 +60768,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-349",
    "self_type" : "type-349",
@@ -60825,8 +60810,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-341",
    "self_type" : "type-341",
@@ -60849,8 +60834,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-383",
    "self_type" : "type-383",
@@ -60891,8 +60876,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-355",
    "self_type" : "type-355",
@@ -60933,8 +60918,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-392",
    "self_type" : "type-392",
diff --git a/Q/64/x86_64/source-based/libstagefright_softomx.so.lsdump b/Q/64/x86_64/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 87c26ba..0000000
--- a/Q/64/x86_64/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28465 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-459",
-   "self_type" : "type-461",
-   "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-449",
-   "self_type" : "type-450",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-391",
-   "self_type" : "type-394",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
-   "size" : 2560,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-80",
-   "self_type" : "type-323",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-108",
-   "self_type" : "type-759",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-196",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-538",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-538",
-   "self_type" : "type-537",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-539",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-635",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-226",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-636",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-321",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-632",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-172",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_mmm"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhmmPKhmmmb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhmmP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhmPKhmmm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-29",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-29",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-265",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-265",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-265",
-   "self_type" : "type-295",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-265",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-265",
-   "self_type" : "type-306",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-302"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-265",
-   "self_type" : "type-301",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-276",
-   "return_type" : "type-265",
-   "self_type" : "type-276",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-279",
-   "return_type" : "type-265",
-   "self_type" : "type-279",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-265",
-   "self_type" : "type-285",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-265",
-   "self_type" : "type-282",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-273"
-    },
-    {
-     "referenced_type" : "type-273"
-    },
-    {
-     "referenced_type" : "type-274"
-    }
-   ],
-   "referenced_type" : "type-272",
-   "return_type" : "type-265",
-   "self_type" : "type-272",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-265",
-   "self_type" : "type-308",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-265",
-   "self_type" : "type-297",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-289"
-    }
-   ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-265",
-   "self_type" : "type-288",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-265",
-   "self_type" : "type-268",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-266"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-265",
-   "self_type" : "type-264",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "referenced_type" : "type-768",
-   "return_type" : "type-29",
-   "self_type" : "type-768",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-269"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-266"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-349",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-733",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-238"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-277"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    },
-    {
-     "referenced_type" : "type-794"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-925"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-790"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-286"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-211"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-214"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-237"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    },
-    {
-     "referenced_type" : "type-794"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-62",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-316"
-    },
-    {
-     "referenced_type" : "type-316"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-794"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-312"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_mmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-283"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-381"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhmmPKhmmmb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-680"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhmmP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEmiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-375"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-113"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-228"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "referenced_type" : "type-260"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-401"
-    }
-   ],
-   "return_type" : "type-29",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-692"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-113",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-265",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-941"
-    },
-    {
-     "referenced_type" : "type-280"
-    },
-    {
-     "referenced_type" : "type-792"
-    }
-   ],
-   "return_type" : "type-89",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhmPKhmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-379"
-    },
-    {
-     "referenced_type" : "type-214"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-313"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-313",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-100"
-    },
-    {
-     "referenced_type" : "type-401"
-    },
-    {
-     "referenced_type" : "type-48"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-722",
-   "self_type" : "type-727",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-733",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-126",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-774",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-783",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-700",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-257",
-   "self_type" : "type-710",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-708",
-   "self_type" : "type-709",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-240",
-   "self_type" : "type-705",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-965",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-385",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-220",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-923",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-669",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-679",
-   "self_type" : "type-790",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-456",
-   "self_type" : "type-477",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-724",
-   "self_type" : "type-725",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-123",
-   "self_type" : "type-124",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-361",
-   "self_type" : "type-704",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-962",
-   "self_type" : "type-964",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-342",
-   "self_type" : "type-346",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-386",
-   "self_type" : "type-388",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-193",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-822",
-   "self_type" : "type-840",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-639",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-924",
-   "self_type" : "type-925",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-629",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-396",
-   "self_type" : "type-409",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-429",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-318",
-   "self_type" : "type-382",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const long &",
-   "name" : "const long &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-432",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-423",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-347",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long &",
-   "name" : "const unsigned long &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-433",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-428",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long &",
-   "name" : "unsigned long &",
-   "referenced_type" : "type-48",
-   "self_type" : "type-399",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-100",
-   "self_type" : "type-398",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-213",
-   "self_type" : "type-212",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-302",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-269",
-   "self_type" : "type-789",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-295",
-   "self_type" : "type-294",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-306",
-   "self_type" : "type-305",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-276",
-   "self_type" : "type-275",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
-   "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-282",
-   "self_type" : "type-281",
-   "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-272",
-   "self_type" : "type-271",
-   "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-308",
-   "self_type" : "type-307",
-   "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-297",
-   "self_type" : "type-296",
-   "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-288",
-   "self_type" : "type-287",
-   "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-268",
-   "self_type" : "type-267",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-264",
-   "self_type" : "type-263",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-283",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-686",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-286",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-273",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-235",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-917",
-   "self_type" : "type-918",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-111",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-777",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-37",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-419",
-   "self_type" : "type-418",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-707",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-723",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-718",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-730",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-129",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-772",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-972",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-237",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-257",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-240",
-   "self_type" : "type-349",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-678",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-310",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-375",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-690",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-966",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-695",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-701",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-552",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-348",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-179",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-793",
-   "self_type" : "type-810",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-930",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-232",
-   "self_type" : "type-927",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-920",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-343",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-936",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-935",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-610",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-716",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-757",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-794",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-685",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-381",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-260",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-919",
-   "self_type" : "type-921",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-456",
-   "self_type" : "type-466",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-49",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-726",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-711",
-   "self_type" : "type-712",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-734",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-26",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-442",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-941",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-379",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-692",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-963",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-699",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-689",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-354",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-311",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-931",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-929",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-924",
-   "self_type" : "type-926",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-676",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-752",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-353",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-200",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-768",
-   "self_type" : "type-769",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-436",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-209",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-274",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-214",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-100",
-   "self_type" : "type-771",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-350",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-257",
-   "self_type" : "type-708",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-683",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-681",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-213",
-   "self_type" : "type-380",
-   "size" : 112,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-679",
-   "size" : 112,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-357",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-64",
-   "self_type" : "type-140",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-70",
-   "self_type" : "type-934",
-   "size" : 88,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-73",
-   "self_type" : "type-787",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-78",
-   "self_type" : "type-456",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-31",
-   "self_type" : "type-315",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-30",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-50",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-256",
-   "self_type" : "type-711",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-731",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-59",
-   "self_type" : "type-135",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-130",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-61",
-   "self_type" : "type-116",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-90",
-   "self_type" : "type-441",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-231",
-   "self_type" : "type-940",
-   "size" : 176,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-253",
-   "self_type" : "type-355",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-240",
-   "self_type" : "type-361",
-   "size" : 176,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-259",
-   "self_type" : "type-953",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-369",
-   "self_type" : "type-378",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-97",
-   "self_type" : "type-691",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-198",
-   "self_type" : "type-359",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-696",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-702",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-99",
-   "self_type" : "type-688",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-342",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-216",
-   "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-387",
-   "self_type" : "type-386",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-62",
-   "self_type" : "type-191",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-233",
-   "self_type" : "type-822",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-639",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-65",
-   "self_type" : "type-924",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-729",
-   "self_type" : "type-938",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-979",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-620",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-236",
-   "self_type" : "type-741",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-80",
-   "self_type" : "type-114",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-113",
-   "self_type" : "type-499",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-109",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-108",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-29",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long",
-   "name" : "const long",
-   "referenced_type" : "type-10",
-   "self_type" : "type-431",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-195",
-   "self_type" : "type-201",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-421",
-   "self_type" : "type-420",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-314",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long",
-   "name" : "const unsigned long",
-   "referenced_type" : "type-48",
-   "self_type" : "type-103",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-427",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-101",
-   "self_type" : "type-402",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-100",
-   "self_type" : "type-792",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-89",
-   "self_type" : "type-766",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-446"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-533"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-513"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-447"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-446"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-529"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-467"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-465"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-462"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-487"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-489"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-486"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-480"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-482"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-484"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 256,
-     "referenced_type" : "type-507"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 288,
-     "referenced_type" : "type-508"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-446"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-505"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-462"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-463"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-458"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-461"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-246"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-462"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-476"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-500"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-471"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 160,
-     "referenced_type" : "type-246"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-214"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 320,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 384,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 512,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 576,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 704,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-263"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-267"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 128,
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 64,
-     "referenced_type" : "type-303"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 192,
-     "referenced_type" : "type-271"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 256,
-     "referenced_type" : "type-275"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 320,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 384,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 448,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 512,
-     "referenced_type" : "type-278"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 576,
-     "referenced_type" : "type-281"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 640,
-     "referenced_type" : "type-284"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 704,
-     "referenced_type" : "type-287"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 768,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 832,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 896,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 960,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 1088,
-     "referenced_type" : "type-300"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 1152,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 1216,
-     "referenced_type" : "type-305"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 1280,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
-   "size" : 168,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-394"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-390"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-545"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-537"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-539"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-573"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-557"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-576"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-541"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-666"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1344,
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1408,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1472,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 192,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-549"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-568"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-555"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-626"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-633"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-635"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-636"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-630"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-249"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 384,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-452"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-251"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-251"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-291"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-570"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-571"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-579"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-244"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 832,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 864,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-248"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-250"
-    }
-   ],
-   "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-244",
-   "self_type" : "type-244",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-547"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-655"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-658"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-642"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-643"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 256,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-637"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-641"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-291"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-618"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-607"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-608"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-583"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-593"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-594"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-177"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-178"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-588"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-597"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-598"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-600"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-601"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-605"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-173"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-603"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-79"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 128,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 256,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 320,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 384,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 448,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 480,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-916",
-   "self_type" : "type-916",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 320,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 384,
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-70"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 704,
-     "referenced_type" : "type-236"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 448,
-     "referenced_type" : "type-76"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 832,
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 1024,
-     "referenced_type" : "type-81"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 1152,
-     "referenced_type" : "type-85"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 1216,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 1248,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 1568,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 248,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 192,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 320,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 448,
-     "referenced_type" : "type-105"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 2624,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 256,
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-110"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-112"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 256,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 320,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-79"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 192,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-226"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-411" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-407"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-413" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-328"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-329" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-521"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-522" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-712"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-257"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 64,
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 128,
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-82"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-255"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 64,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-117"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 64,
-     "referenced_type" : "type-60"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 128,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-146"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-147"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-151"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-152"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-774"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcmj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 56,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-91"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-259"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 512,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 832,
-     "referenced_type" : "type-232"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 896,
-     "referenced_type" : "type-233"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 960,
-     "referenced_type" : "type-238"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 992,
-     "referenced_type" : "type-238"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 1024,
-     "referenced_type" : "type-239"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 1344,
-     "referenced_type" : "type-258"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 176,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 64,
-     "referenced_type" : "type-89"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 72,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 896,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 1216,
-     "referenced_type" : "type-254"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 176,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-415" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 320,
-     "referenced_type" : "type-260"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 384,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 448,
-     "referenced_type" : "type-100"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-971"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcmj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-231"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 1352,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 1408,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 1472,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 1504,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 1536,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 1568,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 1632,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 1664,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1888,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1920,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1952,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 2272,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 2400,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 2528,
-     "referenced_type" : "type-31"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 2656,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 2688,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 2752,
-     "referenced_type" : "type-113"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 2816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 2880,
-     "referenced_type" : "type-228"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 2944,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 3008,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 3136,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 408,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-231"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 1352,
-     "referenced_type" : "type-89"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 1376,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 1408,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 1440,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 1472,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 1504,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 1536,
-     "referenced_type" : "type-370"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-113"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1728,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1792,
-     "referenced_type" : "type-228"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1856,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 64,
-     "referenced_type" : "type-396"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 512,
-     "referenced_type" : "type-76"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 896,
-     "referenced_type" : "type-29"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 928,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 936,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 960,
-     "referenced_type" : "type-763"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 1024,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
-   "size" : 152,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 136,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcim"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 192,
-     "referenced_type" : "type-211"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 256,
-     "referenced_type" : "type-215"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-48"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 192,
-     "referenced_type" : "type-102"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-199"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-200"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-209"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-194"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-206"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-520"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-913"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-897"
-    }
-   ],
-   "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-896",
-   "self_type" : "type-896",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-888"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-887",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-908"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-825"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-828"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-827"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-829"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-112" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-818"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-820"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-817"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-801"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-804" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-802"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-803" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-807"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-808"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-809"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-798"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-799" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-833"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-832"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-835"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-834"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-843"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-842"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-846"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-845"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-849"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-878"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-877",
-   "self_type" : "type-877",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-870"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-869"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-871"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, sp<RefBase> >",
-   "name" : "android::is_one_of<long, sp<RefBase> >",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-863"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long>",
-   "name" : "android::is_one_of<long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIlJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-852"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-857"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-856"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned long>",
-   "name" : "android::is_one_of<unsigned long>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android9is_one_ofImJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-813"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-812"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-811",
-   "self_type" : "type-811",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-814"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-815"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-69"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-70" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-235" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-73" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-66"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-237"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-259" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-764"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-765" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-933"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-934" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-728",
-   "self_type" : "type-728",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-861",
-   "self_type" : "type-861",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-942",
-   "self_type" : "type-942",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-985",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "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-967",
-   "self_type" : "type-967",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-657",
-   "self_type" : "type-657",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "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-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-52",
-   "self_type" : "type-52",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "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-975",
-   "self_type" : "type-975",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-693",
-   "self_type" : "type-693",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-80" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-109" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-58" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-425" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-8",
-   "self_type" : "type-8",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-139" ],
-   "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-56",
-   "self_type" : "type-56",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-48" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-101" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-770",
-   "self_type" : "type-770",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-368"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-253" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-374"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-240" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-366"
-    }
-   ],
-   "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-365",
-   "self_type" : "type-365",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-70" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-73" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-231" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-188"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-755"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-757"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
-   "size" : 16,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-214"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 64,
-     "referenced_type" : "type-753"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 192,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 256,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-108"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 64,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 128,
-     "referenced_type" : "type-100"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 192,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 256,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 320,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-188"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
-   "size" : 80,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-321"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-322"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-322"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-324"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-325"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "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-320",
-   "self_type" : "type-320",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-323"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-196"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-62",
-   "self_type" : "type-204",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-232",
-   "self_type" : "type-928",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-729",
-   "self_type" : "type-937",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/x86_64/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/x86_64/source-based/libstagefright_xmlparser.so.lsdump
index b83cc8e..ff4379c 100644
--- a/Q/64/x86_64/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/x86_64/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 278528,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -37,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
@@ -46,18 +26,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -66,66 +36,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -140,19 +155,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -160,6 +195,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -224,6 +271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
   },
   {
@@ -244,11 +295,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EElEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKclEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEENS_21__tree_const_iteratorIS6_SI_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEE"
   },
   {
    "binding" : "weak",
@@ -256,7 +343,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -264,6 +375,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -279,389 +402,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-25",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "referenced_type" : "type-51"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-27"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-27"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -671,10 +483,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -684,10 +496,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -697,10 +509,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -710,24 +522,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-44",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-25",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -737,10 +535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -750,24 +548,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-25",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -777,37 +561,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-24",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -815,10 +581,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -826,8 +601,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -835,8 +610,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -848,7 +632,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-26",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -856,8 +640,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-43",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -865,35 +649,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-27",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-50",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -906,8 +663,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
-   "size" : 278760,
+   "self_type" : "type-13",
+   "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -915,8 +672,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -925,19 +682,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-24",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
-   "size" : 32,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -945,8 +702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -955,8 +712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -965,8 +722,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 24,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -979,92 +746,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 128,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 512,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 704,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 896,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 1088,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 2229312,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 2229504,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 2229568,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 2229632,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 2229696,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 2229888,
-     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1072,7 +755,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 278760,
+   "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1082,39 +765,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 64,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 128,
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 320,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 512,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
+     "field_offset" : 704,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 512,
-     "referenced_type" : "type-31"
+     "field_offset" : 896,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 704,
-     "referenced_type" : "type-32"
+     "field_offset" : 1088,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 112,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 160,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1124,18 +817,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1146,23 +839,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 192,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
index 0193e2d..f0b38fe 100644
--- a/Q/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
@@ -5,24 +5,24 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
    "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-1682",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1802",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2644",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -48,8 +48,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -57,8 +57,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -66,8 +66,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2421",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -75,8 +75,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -84,8 +84,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -93,8 +93,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IOMX::PortMode [2]",
    "name" : "android::IOMX::PortMode [2]",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -102,8 +102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -111,8 +111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -120,8 +120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MetadataBufferType [2]",
    "name" : "android::MetadataBufferType [2]",
-   "referenced_type" : "type-553",
-   "self_type" : "type-939",
+   "referenced_type" : "type-534",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -129,8 +129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType [2]",
    "name" : "android::OMXNodeInstance::SecureBufferType [2]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -138,8 +138,8 @@
    "alignment" : 1,
    "linker_set_key" : "bool [2]",
    "name" : "bool [2]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-942",
+   "referenced_type" : "type-86",
+   "self_type" : "type-918",
    "size" : 2,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -147,49 +147,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-76",
+   "self_type" : "type-113",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-69",
-   "self_type" : "type-847",
+   "referenced_type" : "type-76",
+   "self_type" : "type-830",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-522",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1984",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-173",
+   "referenced_type" : "type-60",
+   "self_type" : "type-154",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2714",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2697",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -197,8 +188,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2697",
+   "self_type" : "type-2696",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -206,98 +197,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-67",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-60",
+   "self_type" : "type-2698",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1606",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2447",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2570",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-4",
-   "self_type" : "type-866",
+   "self_type" : "type-850",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -306,7 +216,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-4",
-   "self_type" : "type-669",
+   "self_type" : "type-658",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -315,7 +225,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-4",
-   "self_type" : "type-579",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -324,7 +234,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-4",
-   "self_type" : "type-670",
+   "self_type" : "type-659",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -333,7 +243,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-4",
-   "self_type" : "type-64",
+   "self_type" : "type-110",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -342,7 +252,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-4",
-   "self_type" : "type-648",
+   "self_type" : "type-635",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -351,7 +261,7 @@
    "linker_set_key" : "unsigned int [2]",
    "name" : "unsigned int [2]",
    "referenced_type" : "type-2",
-   "self_type" : "type-943",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -360,7 +270,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-2",
-   "self_type" : "type-476",
+   "self_type" : "type-457",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
   },
@@ -369,7 +279,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-496",
+   "self_type" : "type-478",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -382,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 1
   },
   {
@@ -391,8 +301,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1
   },
   {
@@ -401,24 +311,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 4
   },
   {
@@ -426,8 +336,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -435,8 +345,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1650",
    "size" : 4
   },
   {
@@ -444,8 +354,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8
   },
   {
@@ -453,8 +363,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 2
   },
   {
@@ -462,8 +372,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1
   },
   {
@@ -492,8 +402,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1655",
+   "self_type" : "type-1655",
    "size" : 4
   },
   {
@@ -502,8 +412,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 8
   },
   {
@@ -512,15 +422,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126"
+   "referenced_type" : "type-97",
+   "self_type" : "type-97"
   }
  ],
  "elf_functions" :
@@ -943,10 +853,10 @@
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStore9listRolesENSt3__18functionIFvRKNS0_8hidl_vecINS3_9IOmxStore8RoleInfoEEEEEE"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
-   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_"
+   "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_"
   },
   {
    "name" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreD0Ev"
@@ -1084,6 +994,9 @@
    "name" : "_ZN7android9OMXMaster15addVendorPluginEv"
   },
   {
+   "name" : "_ZN7android9OMXMaster17addPlatformPluginEv"
+  },
+  {
    "name" : "_ZN7android9OMXMaster19enumerateComponentsEPcjj"
   },
   {
@@ -1422,6 +1335,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__110__list_impIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE5clearEv"
   },
   {
@@ -1430,9 +1347,25 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__14listIN7android4IOMX13ComponentInfoENS_9allocatorIS3_EEE9push_backEOS3_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
    "name" : "_ZThn4_N7android15OMXNodeInstanceD0Ev"
   },
   {
@@ -1472,10 +1405,6 @@
    "name" : "_ZN7android15OMXNodeInstance10kCallbacksE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
    "name" : "_ZTCN7android15OMXNodeInstance24CallbackDispatcherThreadE0_NS_6ThreadE"
   },
   {
@@ -1685,7 +1614,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_13OMXPluginBaseEEE"
+   "name" : "_ZTVN7android4ListINS_9OMXMaster6PluginEEE"
   },
   {
    "binding" : "weak",
@@ -1759,8 +1688,8 @@
    ],
    "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
    "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -1837,8 +1766,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1891,8 +1820,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -1989,8 +1918,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-2480",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2035,8 +1964,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-2488",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2085,8 +2014,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2135,8 +2064,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2177,8 +2106,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2243,8 +2172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2385,8 +2314,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2427,8 +2356,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2465,8 +2394,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2511,8 +2440,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2553,8 +2482,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2611,8 +2540,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2665,8 +2594,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2707,8 +2636,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2753,8 +2682,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2791,8 +2720,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2372",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2829,8 +2758,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2887,8 +2816,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2921,8 +2850,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2955,8 +2884,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -2997,8 +2926,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3039,8 +2968,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3065,8 +2994,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3103,8 +3032,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3157,8 +3086,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2961",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2935",
+   "self_type" : "type-2935",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3399,8 +3328,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3445,8 +3374,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3551,8 +3480,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3593,8 +3522,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3619,8 +3548,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -3797,11 +3726,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3871,8 +3800,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -3937,8 +3866,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -3971,8 +3900,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4017,8 +3946,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4087,8 +4016,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2933",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2912",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4153,8 +4082,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4203,8 +4132,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4245,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4295,8 +4224,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4337,8 +4266,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -4531,8 +4460,8 @@
    ],
    "linker_set_key" : "OMX_INDEXEXTTYPE",
    "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "underlying_type" : "type-2",
@@ -5229,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -5391,8 +5320,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5433,8 +5362,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5471,8 +5400,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5509,8 +5438,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5551,8 +5480,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2977",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2956",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5589,8 +5518,8 @@
    ],
    "linker_set_key" : "OMX_NALUFORMATSTYPE",
    "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -5619,8 +5548,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5665,8 +5594,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5707,8 +5636,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5757,8 +5686,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5791,8 +5720,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5825,8 +5754,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -5863,8 +5792,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5901,8 +5830,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5935,8 +5864,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -5973,8 +5902,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6027,8 +5956,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6053,8 +5982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-471",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6079,8 +6008,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
    "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6185,8 +6114,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6223,8 +6152,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6245,8 +6174,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
    "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6299,8 +6228,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6337,8 +6266,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6419,8 +6348,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6469,8 +6398,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6527,8 +6456,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6589,8 +6518,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
    "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6647,8 +6576,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6709,8 +6638,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6835,8 +6764,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
    "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6806,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
    "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6844,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -6957,8 +6886,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7053,8 +6982,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7119,8 +7048,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7209,8 +7138,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7267,8 +7196,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7309,8 +7238,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7347,8 +7276,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
    "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7373,8 +7302,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
    "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7451,8 +7380,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
    "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7434,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
    "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "underlying_type" : "type-2",
@@ -7547,8 +7476,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7613,8 +7542,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3041",
-   "self_type" : "type-3041",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7655,8 +7584,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -7713,8 +7642,8 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "underlying_type" : "type-2",
@@ -7739,8 +7668,8 @@
    ],
    "linker_set_key" : "android::ActionCode",
    "name" : "android::ActionCode",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3100",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3074",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h",
    "underlying_type" : "type-2",
@@ -7765,8 +7694,8 @@
    ],
    "linker_set_key" : "android::AudioEncoding",
    "name" : "android::AudioEncoding",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
    "underlying_type" : "type-2",
@@ -7811,8 +7740,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-988",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7857,8 +7786,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7887,8 +7816,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -7945,8 +7874,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2932",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8011,8 +7940,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8045,8 +7974,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3073",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8111,8 +8040,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-3097",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3070",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8169,8 +8098,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-3098",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3072",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8191,8 +8120,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -8209,65 +8138,14 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2935",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2902",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8306,8 +8184,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2853",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8344,8 +8222,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8374,8 +8252,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2872",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2841",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8396,8 +8274,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-612",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8430,11 +8308,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -8456,8 +8334,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::Quirks",
    "name" : "android::OMXNodeInstance::Quirks",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8483,8 +8361,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::SecureBufferType",
    "name" : "android::OMXNodeInstance::SecureBufferType",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "underlying_type" : "type-2",
@@ -8501,8 +8379,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8519,8 +8397,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8545,8 +8423,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8587,8 +8465,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8649,11 +8527,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-67",
+   "underlying_type" : "type-60",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -8753,8 +8631,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1937",
-   "self_type" : "type-1937",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -8779,8 +8657,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1950",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -8821,8 +8699,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9063,8 +8941,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9093,8 +8971,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9123,8 +9001,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9165,8 +9043,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9203,8 +9081,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -9229,8 +9107,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9247,8 +9125,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9277,8 +9155,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-1940",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -9371,8 +9249,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9413,8 +9291,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1920",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9431,8 +9309,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -9461,8 +9339,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -9495,8 +9373,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -9549,8 +9427,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -9566,12 +9444,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-903",
-   "return_type" : "type-863",
-   "self_type" : "type-903",
+   "referenced_type" : "type-887",
+   "return_type" : "type-847",
+   "self_type" : "type-887",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9581,15 +9459,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-892",
-   "return_type" : "type-863",
-   "self_type" : "type-892",
+   "referenced_type" : "type-876",
+   "return_type" : "type-847",
+   "self_type" : "type-876",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9599,24 +9477,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-888",
-   "return_type" : "type-863",
-   "self_type" : "type-888",
+   "referenced_type" : "type-872",
+   "return_type" : "type-847",
+   "self_type" : "type-872",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9626,27 +9504,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     }
    ],
-   "referenced_type" : "type-885",
-   "return_type" : "type-863",
-   "self_type" : "type-885",
+   "referenced_type" : "type-869",
+   "return_type" : "type-847",
+   "self_type" : "type-869",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9656,24 +9534,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-905",
-   "return_type" : "type-863",
-   "self_type" : "type-905",
+   "referenced_type" : "type-889",
+   "return_type" : "type-847",
+   "self_type" : "type-889",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9683,18 +9561,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-879"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-894",
-   "return_type" : "type-863",
-   "self_type" : "type-894",
+   "referenced_type" : "type-878",
+   "return_type" : "type-847",
+   "self_type" : "type-878",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9704,21 +9582,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-868",
-   "return_type" : "type-863",
-   "self_type" : "type-868",
+   "referenced_type" : "type-852",
+   "return_type" : "type-847",
+   "self_type" : "type-852",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9728,18 +9606,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-871",
-   "return_type" : "type-863",
-   "self_type" : "type-871",
+   "referenced_type" : "type-855",
+   "return_type" : "type-847",
+   "self_type" : "type-855",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9749,15 +9627,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-861"
     }
    ],
-   "referenced_type" : "type-876",
-   "return_type" : "type-863",
-   "self_type" : "type-876",
+   "referenced_type" : "type-860",
+   "return_type" : "type-847",
+   "self_type" : "type-860",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9767,18 +9645,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "referenced_type" : "type-873",
-   "return_type" : "type-863",
-   "self_type" : "type-873",
+   "referenced_type" : "type-857",
+   "return_type" : "type-847",
+   "self_type" : "type-857",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9788,24 +9666,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-848"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-849"
     }
    ],
-   "referenced_type" : "type-862",
-   "return_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-846",
+   "return_type" : "type-847",
+   "self_type" : "type-846",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9815,18 +9693,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-907",
-   "return_type" : "type-863",
-   "self_type" : "type-907",
+   "referenced_type" : "type-891",
+   "return_type" : "type-847",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9836,18 +9714,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-890",
-   "return_type" : "type-863",
-   "self_type" : "type-890",
+   "referenced_type" : "type-874",
+   "return_type" : "type-847",
+   "self_type" : "type-874",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9857,24 +9735,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-865"
     }
    ],
-   "referenced_type" : "type-880",
-   "return_type" : "type-863",
-   "self_type" : "type-880",
+   "referenced_type" : "type-864",
+   "return_type" : "type-847",
+   "self_type" : "type-864",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -9884,18 +9762,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "referenced_type" : "type-901",
-   "return_type" : "type-863",
-   "self_type" : "type-901",
+   "referenced_type" : "type-885",
+   "return_type" : "type-847",
+   "self_type" : "type-885",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9905,13 +9783,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -9920,12 +9798,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-898",
-   "return_type" : "type-863",
-   "self_type" : "type-898",
+   "referenced_type" : "type-882",
+   "return_type" : "type-847",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -9935,12 +9813,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-2043",
-   "return_type" : "type-67",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2023",
+   "return_type" : "type-60",
+   "self_type" : "type-2023",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -9950,27 +9828,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-413"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-126",
-   "self_type" : "type-432",
+   "referenced_type" : "type-411",
+   "return_type" : "type-97",
+   "self_type" : "type-411",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   }
  ],
@@ -9982,10 +9860,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-1145",
+   "return_type" : "type-1118",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -9996,10 +9874,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2811"
+     "referenced_type" : "type-2785"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10010,10 +9888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2818"
+     "referenced_type" : "type-2792"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10024,10 +9902,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     }
    ],
-   "return_type" : "type-254",
+   "return_type" : "type-235",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -10037,13 +9915,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-609"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-615"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
   {
@@ -10053,20 +9931,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10076,7 +9954,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10085,7 +9963,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10095,13 +9973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10111,26 +9989,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10140,16 +10018,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10159,16 +10037,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3160"
+     "referenced_type" : "type-3146"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10179,22 +10057,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-3142"
     },
     {
-     "referenced_type" : "type-3117"
+     "referenced_type" : "type-3091"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10205,10 +10083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10221,19 +10099,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10244,10 +10122,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-2",
@@ -10260,19 +10138,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10283,25 +10161,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10312,7 +10190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10327,13 +10205,13 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10344,13 +10222,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10360,10 +10238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10374,16 +10252,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10394,7 +10272,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10403,7 +10281,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10413,13 +10291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10430,10 +10308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-933",
+   "return_type" : "type-909",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10444,13 +10322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10460,13 +10338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10476,16 +10354,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10496,7 +10374,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10505,7 +10383,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10516,7 +10394,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10525,7 +10403,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-159",
+   "return_type" : "type-139",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10535,16 +10413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10555,13 +10433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10572,10 +10450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10586,13 +10464,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-114",
+   "return_type" : "type-81",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10602,16 +10480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10622,13 +10500,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10639,7 +10517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10648,7 +10526,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10659,19 +10537,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10682,13 +10560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10699,19 +10577,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10722,13 +10600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10739,19 +10617,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10761,7 +10639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
@@ -10770,16 +10648,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10790,25 +10668,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10819,19 +10697,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10841,16 +10719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10861,13 +10739,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10878,16 +10756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10897,22 +10775,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10923,19 +10801,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10946,25 +10824,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -10974,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -10989,7 +10867,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11000,22 +10878,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11026,22 +10904,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11052,19 +10930,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11074,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-125",
+   "return_type" : "type-96",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11087,13 +10965,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11102,10 +10980,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11115,10 +10993,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-899"
+     "referenced_type" : "type-883"
     },
     {
      "referenced_type" : "type-2"
@@ -11127,7 +11005,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11137,10 +11015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11150,10 +11028,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-928",
+   "return_type" : "type-900",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11163,19 +11041,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11185,19 +11063,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11207,13 +11085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11223,13 +11101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11239,19 +11117,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11261,19 +11139,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11283,19 +11161,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11306,10 +11184,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11320,10 +11198,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11334,10 +11212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
@@ -11346,13 +11224,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-130",
+   "return_type" : "type-101",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11361,13 +11239,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11376,10 +11254,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11388,13 +11266,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11403,19 +11281,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11425,10 +11303,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11438,10 +11316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11451,16 +11329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     },
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-683"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-2"
@@ -11472,7 +11350,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11482,10 +11360,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-797"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
   },
   {
@@ -11495,13 +11373,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11511,13 +11389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-640"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11527,13 +11405,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-626"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -11542,10 +11420,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-595"
     }
    ],
-   "return_type" : "type-119",
+   "return_type" : "type-86",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
   {
@@ -11555,13 +11433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-2746"
+     "referenced_type" : "type-2720"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11571,13 +11449,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11587,13 +11465,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1080"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11603,13 +11481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-2750"
+     "referenced_type" : "type-2724"
     }
    ],
-   "return_type" : "type-3175",
+   "return_type" : "type-3163",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11619,13 +11497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11635,13 +11513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2747"
+     "referenced_type" : "type-2721"
     },
     {
-     "referenced_type" : "type-3068"
+     "referenced_type" : "type-3059"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
@@ -11651,10 +11529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11664,10 +11542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11677,13 +11555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11693,16 +11571,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-2879"
+     "referenced_type" : "type-2852"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11712,10 +11590,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-2592",
+   "return_type" : "type-2562",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11725,13 +11603,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11741,13 +11619,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2654"
+     "referenced_type" : "type-2627"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11757,10 +11635,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3178",
+   "return_type" : "type-3166",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11770,10 +11648,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3179",
+   "return_type" : "type-3167",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11783,13 +11661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3180",
+   "return_type" : "type-3168",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11799,16 +11677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2882"
+     "referenced_type" : "type-2856"
     }
    ],
-   "return_type" : "type-3181",
+   "return_type" : "type-3169",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11818,10 +11696,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     }
    ],
-   "return_type" : "type-3182",
+   "return_type" : "type-3170",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11831,13 +11709,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11847,13 +11725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2566"
+     "referenced_type" : "type-2541"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
@@ -11863,16 +11741,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3185",
+   "return_type" : "type-3173",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11882,13 +11760,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3186",
+   "return_type" : "type-3174",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11898,13 +11776,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3187",
+   "return_type" : "type-3175",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11914,13 +11792,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1580"
     }
    ],
-   "return_type" : "type-3188",
+   "return_type" : "type-3176",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11930,13 +11808,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3189",
+   "return_type" : "type-3177",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11946,16 +11824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-3190",
+   "return_type" : "type-3178",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11965,13 +11843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-3192"
+     "referenced_type" : "type-3180"
     }
    ],
-   "return_type" : "type-3191",
+   "return_type" : "type-3179",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11981,10 +11859,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     }
    ],
-   "return_type" : "type-3193",
+   "return_type" : "type-3181",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -11994,13 +11872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
-   "return_type" : "type-3194",
+   "return_type" : "type-3182",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12010,16 +11888,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     },
     {
-     "referenced_type" : "type-3196"
+     "referenced_type" : "type-3184"
     }
    ],
-   "return_type" : "type-3195",
+   "return_type" : "type-3183",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12029,13 +11907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-3197",
+   "return_type" : "type-3185",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12045,13 +11923,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12061,13 +11939,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1116"
     },
     {
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-1494"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
   {
@@ -12077,16 +11955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12096,19 +11974,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-935"
     },
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-936"
     },
     {
-     "referenced_type" : "type-3201"
+     "referenced_type" : "type-3189"
     }
    ],
-   "return_type" : "type-3200",
+   "return_type" : "type-3188",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12118,13 +11996,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3203"
+     "referenced_type" : "type-3191"
     }
    ],
-   "return_type" : "type-3202",
+   "return_type" : "type-3190",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12134,13 +12012,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3156"
+     "referenced_type" : "type-3130"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12150,13 +12028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-3205"
+     "referenced_type" : "type-3193"
     }
    ],
-   "return_type" : "type-3204",
+   "return_type" : "type-3192",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12166,10 +12044,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12179,10 +12057,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12192,10 +12070,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12205,10 +12083,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12218,10 +12096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
@@ -12231,13 +12109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3207"
+     "referenced_type" : "type-3195"
     }
    ],
-   "return_type" : "type-3206",
+   "return_type" : "type-3194",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12247,13 +12125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3209"
+     "referenced_type" : "type-3197"
     }
    ],
-   "return_type" : "type-3208",
+   "return_type" : "type-3196",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12263,13 +12141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-3210",
+   "return_type" : "type-3198",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12279,79 +12157,79 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-3212"
+     "referenced_type" : "type-3200"
     }
    ],
-   "return_type" : "type-3211",
+   "return_type" : "type-3199",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC1ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "function_name" : "android::hardware::media::omx::V1_0::implementation::OmxStore::OmxStore",
-   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2EPKcPKS7_S7_S7_S7_",
+   "linker_set_key" : "_ZN7android8hardware5media3omx4V1_014implementation8OmxStoreC2ERKNS_2spINS3_4IOmxEEEPKcRKNSt3__16vectorINSD_12basic_stringIcNSD_11char_traitsIcEENSD_9allocatorIcEEEENSI_ISK_EEEESO_SC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1321"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-101"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-1438"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12361,10 +12239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12374,10 +12252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12387,10 +12265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
@@ -12400,20 +12278,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12423,7 +12301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12432,7 +12310,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12442,26 +12320,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12471,16 +12349,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12490,16 +12368,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3214"
+     "referenced_type" : "type-3202"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12509,19 +12387,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12531,19 +12409,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12553,13 +12431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2557"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12569,13 +12447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-3104"
+     "referenced_type" : "type-3077"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12585,16 +12463,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-874"
+     "referenced_type" : "type-858"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12604,7 +12482,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
@@ -12613,16 +12491,16 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-2055"
+     "referenced_type" : "type-2032"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12632,16 +12510,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12651,22 +12529,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-520"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12676,13 +12554,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-2"
@@ -12691,7 +12569,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12701,10 +12579,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12714,19 +12592,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12736,19 +12614,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-134"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12758,19 +12636,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2554"
     },
     {
-     "referenced_type" : "type-540"
+     "referenced_type" : "type-519"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12780,13 +12658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12796,13 +12674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2578"
+     "referenced_type" : "type-2550"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1561"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12812,19 +12690,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3215",
+   "return_type" : "type-3203",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12834,7 +12712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
@@ -12843,7 +12721,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3216",
+   "return_type" : "type-3204",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12853,25 +12731,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-3217",
+   "return_type" : "type-3205",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12881,16 +12759,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-3218",
+   "return_type" : "type-3206",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12900,16 +12778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3220"
+     "referenced_type" : "type-3208"
     }
    ],
-   "return_type" : "type-3219",
+   "return_type" : "type-3207",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12919,19 +12797,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3222"
+     "referenced_type" : "type-3210"
     }
    ],
-   "return_type" : "type-3221",
+   "return_type" : "type-3209",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12941,16 +12819,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3223",
+   "return_type" : "type-3211",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12960,13 +12838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2605"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-3224",
+   "return_type" : "type-3212",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12976,13 +12854,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-3225",
+   "return_type" : "type-3213",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -12992,16 +12870,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-2601"
+     "referenced_type" : "type-2575"
     },
     {
-     "referenced_type" : "type-3227"
+     "referenced_type" : "type-3215"
     }
    ],
-   "return_type" : "type-3226",
+   "return_type" : "type-3214",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13011,19 +12889,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-3229"
+     "referenced_type" : "type-3217"
     }
    ],
-   "return_type" : "type-3228",
+   "return_type" : "type-3216",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13033,16 +12911,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3231"
+     "referenced_type" : "type-3219"
     }
    ],
-   "return_type" : "type-3230",
+   "return_type" : "type-3218",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13052,22 +12930,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-3233"
+     "referenced_type" : "type-3221"
     }
    ],
-   "return_type" : "type-3232",
+   "return_type" : "type-3220",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13077,13 +12955,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "referenced_type" : "type-2"
@@ -13092,7 +12970,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-3234",
+   "return_type" : "type-3222",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13102,10 +12980,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     }
    ],
-   "return_type" : "type-3235",
+   "return_type" : "type-3223",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13115,19 +12993,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     },
     {
-     "referenced_type" : "type-3237"
+     "referenced_type" : "type-3225"
     }
    ],
-   "return_type" : "type-3236",
+   "return_type" : "type-3224",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13137,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-3238",
+   "return_type" : "type-3226",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13156,19 +13034,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2568"
     },
     {
-     "referenced_type" : "type-3240"
+     "referenced_type" : "type-3228"
     }
    ],
-   "return_type" : "type-3239",
+   "return_type" : "type-3227",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13178,13 +13056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13194,13 +13072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1075"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-587"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
@@ -13211,10 +13089,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13225,10 +13103,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::OMXMaster::addPlatformPlugin",
+   "linker_set_key" : "_ZN7android9OMXMaster17addPlatformPluginEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-828"
+    }
+   ],
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13238,10 +13130,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-2"
@@ -13250,7 +13142,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13260,16 +13152,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1928"
+     "referenced_type" : "type-1900"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13279,22 +13171,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-2322"
+     "referenced_type" : "type-2311"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-2325"
+     "referenced_type" : "type-2316"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13304,13 +13196,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     }
    ],
-   "return_type" : "type-863",
+   "return_type" : "type-847",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13321,13 +13213,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13338,13 +13230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13354,10 +13246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13367,10 +13259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13380,10 +13272,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13393,10 +13285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13406,10 +13298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
   {
@@ -13420,16 +13312,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13440,16 +13332,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13460,16 +13352,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13480,19 +13372,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13503,19 +13395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13526,19 +13418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13549,19 +13441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13572,16 +13464,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13592,16 +13484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13612,16 +13504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13632,19 +13524,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13655,19 +13547,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13678,19 +13570,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13701,19 +13593,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13724,16 +13616,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13744,16 +13636,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13764,16 +13656,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13784,19 +13676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13807,19 +13699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13830,19 +13722,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13853,19 +13745,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1912"
+     "referenced_type" : "type-1888"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13876,16 +13768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13896,16 +13788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13916,16 +13808,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13936,19 +13828,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13959,19 +13851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13982,19 +13874,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14005,19 +13897,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1923"
+     "referenced_type" : "type-1899"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14028,16 +13920,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14048,16 +13940,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14068,16 +13960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14088,19 +13980,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14111,19 +14003,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14134,19 +14026,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14157,19 +14049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14180,16 +14072,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14200,16 +14092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14220,16 +14112,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14240,19 +14132,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14263,19 +14155,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14286,19 +14178,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14309,19 +14201,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14332,16 +14224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14352,16 +14244,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14372,16 +14264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14392,19 +14284,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14415,19 +14307,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14438,19 +14330,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14461,19 +14353,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-279"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14484,16 +14376,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14504,16 +14396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14524,16 +14416,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14544,19 +14436,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14567,19 +14459,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14590,19 +14482,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14613,19 +14505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-292"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14636,16 +14528,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
-   "return_type" : "type-67",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14656,16 +14548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14676,16 +14568,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14696,19 +14588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14719,19 +14611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14742,19 +14634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14765,19 +14657,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-296"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -14788,16 +14680,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14808,16 +14700,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14828,19 +14720,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14851,19 +14743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14874,19 +14766,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14897,19 +14789,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14920,16 +14812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14940,16 +14832,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14960,19 +14852,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -14983,19 +14875,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15006,19 +14898,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15029,19 +14921,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1230"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -15051,16 +14943,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
-     "referenced_type" : "type-430"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1282"
     }
    ],
-   "return_type" : "type-126",
+   "return_type" : "type-97",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   }
  ],
@@ -15069,14 +14961,8 @@
   {
    "linker_set_key" : "_ZN7android15OMXNodeInstance10kCallbacksE",
    "name" : "android::OMXNodeInstance::kCallbacks",
-   "referenced_type" : "type-896",
+   "referenced_type" : "type-880",
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-523",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "lvalue_reference_types" :
@@ -15085,8 +14971,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const &",
    "name" : "OMX_BUFFERHEADERTYPE *const &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15094,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_COMPONENTTYPE *const &",
    "name" : "OMX_COMPONENTTYPE *const &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15103,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::DescribeColorFormat2Params &",
    "name" : "android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -15112,8 +14998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15121,8 +15007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15130,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15139,8 +15025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15148,8 +15034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15157,8 +15043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15166,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15175,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15184,8 +15070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15193,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15202,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15211,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15220,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2608",
-   "self_type" : "type-2607",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15229,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2730",
+   "referenced_type" : "type-2704",
+   "self_type" : "type-2703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15238,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15247,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2858",
+   "self_type" : "type-2857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15256,17 +15142,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2279",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15274,8 +15160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15283,35 +15169,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *const &",
-   "name" : "android::OMXNodeInstance *const &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *&",
-   "name" : "android::OMXPluginBase *&",
-   "referenced_type" : "type-851",
-   "self_type" : "type-2234",
+   "linker_set_key" : "android::OMXMaster::Plugin &",
+   "name" : "android::OMXMaster::Plugin &",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *const &",
+   "name" : "android::OMXNodeInstance *const &",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *const &",
    "name" : "android::OMXPluginBase *const &",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15319,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15328,8 +15214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-285",
+   "referenced_type" : "type-254",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15337,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15346,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15355,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15364,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15373,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1770",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15382,8 +15268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15391,8 +15277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15400,8 +15286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15409,8 +15295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15418,8 +15304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15427,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2559",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15436,8 +15322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2733",
-   "self_type" : "type-2732",
+   "referenced_type" : "type-2706",
+   "self_type" : "type-2705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15445,8 +15331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15454,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-433",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15463,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15472,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15481,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -15490,8 +15376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-264",
+   "referenced_type" : "type-144",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15499,8 +15385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15508,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15517,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15526,8 +15412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15535,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<long long, long long> &",
    "name" : "android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-265",
+   "referenced_type" : "type-147",
+   "self_type" : "type-246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15544,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-263",
+   "referenced_type" : "type-138",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15553,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-721",
+   "referenced_type" : "type-688",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15562,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15571,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::omx_message &",
    "name" : "android::omx_message &",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -15580,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-137",
+   "referenced_type" : "type-57",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15589,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-22",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15598,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> &",
    "name" : "android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-40",
+   "referenced_type" : "type-10",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15607,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
    "name" : "android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15616,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IOMXBufferSource> &",
    "name" : "android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3105",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15625,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &",
    "name" : "android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-557",
+   "referenced_type" : "type-524",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-14",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-124",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> &",
    "name" : "android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-840",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-823",
+   "self_type" : "type-1121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-803",
+   "referenced_type" : "type-67",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15670,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15679,8 +15565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE &",
    "name" : "const OMX_INDEXTYPE &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-222",
+   "referenced_type" : "type-201",
+   "self_type" : "type-204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15688,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -15697,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorAspects &",
    "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-983",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -15706,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormat2Params &",
    "name" : "const android::DescribeColorFormat2Params &",
-   "referenced_type" : "type-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15715,8 +15601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::DescribeColorFormatParams &",
    "name" : "const android::DescribeColorFormatParams &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-646",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -15724,564 +15610,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOMX::ComponentInfo &",
    "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1660",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2032",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2301",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2502",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2646",
-   "self_type" : "type-2648",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2803",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMX::ComponentInfo &",
-   "name" : "const android::IOMX::ComponentInfo &",
-   "referenced_type" : "type-2924",
-   "self_type" : "type-2926",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2268",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::String8> &",
-   "name" : "const android::List<android::String8> &",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::MediaImage &",
-   "name" : "const android::MediaImage &",
-   "referenced_type" : "type-628",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1024",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1434",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1817",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2017",
-   "self_type" : "type-2019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2491",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2583",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2792",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-2914",
-   "self_type" : "type-2916",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXBuffer &",
-   "name" : "const android::OMXBuffer &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2276",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2475",
-   "self_type" : "type-2477",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2629",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2775",
-   "self_type" : "type-2777",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXFenceParcelable &",
-   "name" : "const android::OMXFenceParcelable &",
-   "referenced_type" : "type-2877",
-   "self_type" : "type-2879",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcelable &",
-   "name" : "const android::Parcelable &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2866",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-330",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::binder::Status &",
-   "name" : "const android::binder::Status &",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2626",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2260",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2617",
-   "self_type" : "type-2619",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2760",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2894",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-1006",
    "self_type" : "type-1008",
    "size" : 4,
@@ -16289,539 +15617,638 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1643",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2010",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2282",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2598",
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2618",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2777",
+   "self_type" : "type-2779",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMX::ComponentInfo &",
+   "name" : "const android::IOMX::ComponentInfo &",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2906",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> &",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> &",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<android::String8> &",
+   "name" : "const android::List<android::String8> &",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::MediaImage &",
+   "name" : "const android::MediaImage &",
+   "referenced_type" : "type-610",
+   "self_type" : "type-615",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2783",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2765",
+   "self_type" : "type-2767",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_handle &",
-   "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2882",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2314",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-2599",
-   "self_type" : "type-2601",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_string &",
-   "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
-   "referenced_type" : "type-2748",
-   "self_type" : "type-2750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
-   "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2589",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2027",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2496",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2595",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2797",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
-   "referenced_type" : "type-2919",
-   "self_type" : "type-2921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1018",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2013",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2445",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2635",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2786",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2911",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1450",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1665",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2038",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2507",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2653",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2808",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
-   "referenced_type" : "type-2929",
-   "self_type" : "type-2931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2271",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2472",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2603",
-   "self_type" : "type-2605",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2769",
-   "self_type" : "type-2772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
-   "name" : "const android::hardware::media::omx::V1_0::Message &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1616",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1984",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2256",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2457",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2613",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
-   "referenced_type" : "type-2889",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-2888",
    "self_type" : "type-2891",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
-   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-521",
+   "self_type" : "type-523",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXBuffer &",
+   "name" : "const android::OMXBuffer &",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2247",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2447",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2600",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2752",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2852",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXFenceParcelable &",
+   "name" : "const android::OMXFenceParcelable &",
+   "referenced_type" : "type-974",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXMaster::Plugin &",
+   "name" : "const android::OMXMaster::Plugin &",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "name" : "const android::OMXNodeInstance::ActiveBuffer &",
+   "referenced_type" : "type-225",
+   "self_type" : "type-302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-435",
+   "self_type" : "type-436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcelable &",
+   "name" : "const android::Parcelable &",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-308",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-262",
+   "self_type" : "type-264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String8 &",
+   "name" : "const android::String8 &",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::binder::Status &",
+   "name" : "const android::binder::Status &",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2595",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2590",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2867",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status> &",
+   "referenced_type" : "type-956",
+   "self_type" : "type-959",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1400",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1614",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2571",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
+   "referenced_type" : "type-2854",
+   "self_type" : "type-2856",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_handle &",
+   "name" : "const android::hardware::hidl_handle &",
    "referenced_type" : "type-980",
    "self_type" : "type-982",
    "size" : 4,
@@ -16829,107 +16256,98 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
-   "referenced_type" : "type-227",
-   "self_type" : "type-228",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1441",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1757",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1945",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1213",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2285",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1751",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2575",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const android::hardware::hidl_string &",
+   "name" : "const android::hardware::hidl_string &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
-   "name" : "const android::key_value_pair_t<long long, long long> &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message> &",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2724",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
+   "name" : "const android::hardware::hidl_vec<unsigned char> &",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1407",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-1990",
    "self_type" : "type-1992",
    "size" : 4,
@@ -16937,17 +16355,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2265",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
    "referenced_type" : "type-2464",
    "self_type" : "type-2466",
    "size" : 4,
@@ -16955,44 +16373,107 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2586",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2766",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2774",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-2897",
-   "self_type" : "type-2899",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "name" : "const android::hardware::media::omx::V1_0::CodecBuffer &",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2896",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1403",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::omx_message &",
-   "name" : "const android::omx_message &",
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1980",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2418",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2759",
+   "self_type" : "type-2761",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2885",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects &",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects &",
    "referenced_type" : "type-990",
    "self_type" : "type-992",
    "size" : 4,
@@ -17000,10 +16481,424 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1017",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1427",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1638",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2001",
+   "self_type" : "type-2006",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2278",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2784",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo &",
+   "referenced_type" : "type-2909",
+   "self_type" : "type-2911",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1603",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2440",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2878",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Message &",
+   "name" : "const android::hardware::media::omx::V1_0::Message &",
+   "referenced_type" : "type-969",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1951",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2227",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2587",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2730",
+   "self_type" : "type-2732",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::Status &",
+   "name" : "const android::hardware::media::omx::V1_0::Status &",
+   "referenced_type" : "type-953",
+   "self_type" : "type-955",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> &",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> &",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > &",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<long long, long long> &",
+   "name" : "const android::key_value_pair_t<long long, long long> &",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> &",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-696",
+   "self_type" : "type-697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1597",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1790",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2236",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2435",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2557",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-2870",
+   "self_type" : "type-2873",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-528",
+   "self_type" : "type-530",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::omx_message &",
+   "name" : "const android::omx_message &",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17011,8 +16906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17020,8 +16915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-636",
-   "self_type" : "type-639",
+   "referenced_type" : "type-619",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17029,8 +16924,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-402",
+   "referenced_type" : "type-365",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17038,8 +16933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-119",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17047,8 +16942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17056,8 +16951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-39",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17065,8 +16960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-663",
-   "self_type" : "type-664",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17074,8 +16969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> &",
    "name" : "const android::sp<android::IMemory> &",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17083,8 +16978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> &",
    "name" : "const android::sp<android::IOMXBufferSource> &",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17092,8 +16987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> &",
    "name" : "const android::sp<android::IOMXNode> &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXUtils.h"
   },
@@ -17101,8 +16996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> &",
    "name" : "const android::sp<android::IOMXObserver> &",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17110,8 +17005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> &",
    "name" : "const android::sp<android::IOmxNodeWrapper> &",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-682",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17119,8 +17014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> &",
    "name" : "const android::sp<android::NativeHandle> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-559",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17128,8 +17023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance> &",
    "name" : "const android::sp<android::OMXNodeInstance> &",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3156",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17137,8 +17032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> &",
    "name" : "const android::sp<android::OmxGraphicBufferSource> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17146,8 +17041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17155,8 +17050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> &",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -17164,8 +17059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17173,8 +17068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -17182,8 +17077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> &",
    "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-802",
+   "referenced_type" : "type-418",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17200,8 +17095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17209,8 +17104,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17218,8 +17113,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17227,8 +17122,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17236,8 +17131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-930",
+   "self_type" : "type-1807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17245,8 +17140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-366",
+   "referenced_type" : "type-107",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17254,8 +17149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17263,8 +17158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17272,8 +17167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17281,17 +17176,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2718",
+   "self_type" : "type-2720",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-414",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17299,8 +17212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-273",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17308,8 +17221,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-437",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-416",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17317,8 +17230,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17326,8 +17239,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17335,8 +17248,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-1258",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17344,8 +17257,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17353,8 +17266,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17362,8 +17275,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-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17371,8 +17284,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-2739",
-   "self_type" : "type-2738",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -17380,8 +17293,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17389,8 +17302,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
    "name" : "std::list<android::omx_message, std::allocator<android::omx_message> > &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -17399,7 +17312,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-385",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17407,8 +17320,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-125",
-   "self_type" : "type-384",
+   "referenced_type" : "type-96",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -17419,8 +17332,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17428,8 +17341,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17437,26 +17350,26 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17464,8 +17377,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17473,8 +17386,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17482,8 +17395,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17491,8 +17404,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17500,8 +17413,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1921",
-   "self_type" : "type-1920",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17509,8 +17422,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17518,8 +17431,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17527,8 +17440,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17536,8 +17449,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17545,8 +17458,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2729",
-   "self_type" : "type-2728",
+   "referenced_type" : "type-2702",
+   "self_type" : "type-2701",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17554,8 +17467,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17563,8 +17476,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17572,8 +17485,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17581,8 +17494,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17590,8 +17503,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -17599,8 +17512,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-159",
-   "self_type" : "type-886",
+   "referenced_type" : "type-139",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17608,8 +17521,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const *",
    "name" : "OMX_BUFFERHEADERTYPE *const *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-242",
+   "referenced_type" : "type-210",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17617,150 +17530,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-859",
-   "self_type" : "type-2325",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-888",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-885",
-   "self_type" : "type-884",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-905",
-   "self_type" : "type-904",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-868",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "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-873",
-   "self_type" : "type-872",
-   "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-862",
-   "self_type" : "type-861",
-   "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-907",
-   "self_type" : "type-906",
-   "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-890",
-   "self_type" : "type-889",
-   "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-880",
    "self_type" : "type-879",
    "size" : 4,
@@ -17768,35 +17537,71 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "linker_set_key" : "OMX_COMPONENTTYPE *",
+   "name" : "OMX_COMPONENTTYPE *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_COMPONENTTYPE **",
+   "name" : "OMX_COMPONENTTYPE **",
+   "referenced_type" : "type-843",
+   "self_type" : "type-2316",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *)",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "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-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-874",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
+   "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-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-889",
+   "self_type" : "type-888",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "referenced_type" : "type-878",
    "self_type" : "type-877",
    "size" : 4,
@@ -17804,11 +17609,119 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "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-857",
+   "self_type" : "type-856",
+   "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-846",
+   "self_type" : "type-845",
+   "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-891",
+   "self_type" : "type-890",
+   "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-874",
+   "self_type" : "type-873",
+   "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-864",
+   "self_type" : "type-863",
+   "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-885",
+   "self_type" : "type-884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "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-882",
    "self_type" : "type-881",
    "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_INDEXTYPE *",
+   "name" : "OMX_INDEXTYPE *",
+   "referenced_type" : "type-134",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_STATETYPE *",
+   "name" : "OMX_STATETYPE *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
+   "name" : "OMX_TUNNELSETUPTYPE *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -17816,7 +17729,7 @@
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
    "referenced_type" : "type-6",
-   "self_type" : "type-864",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17824,8 +17737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17833,8 +17746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17842,8 +17755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17851,8 +17764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17860,8 +17773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17869,8 +17782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17878,8 +17791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17887,8 +17800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17896,8 +17809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17905,8 +17818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17914,8 +17827,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2700",
+   "self_type" : "type-2699",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17923,8 +17836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17932,8 +17845,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-357",
+   "self_type" : "type-356",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17941,8 +17854,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17950,8 +17863,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17959,8 +17872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ABuffer *",
    "name" : "android::ABuffer *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17968,8 +17881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17977,8 +17890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-807",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17986,8 +17899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-788",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17995,1329 +17908,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3092",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
-   "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
-   "name" : "android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
-   "name" : "android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
-   "name" : "android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2811",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BpRefBase *",
-   "name" : "android::BpRefBase *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-2115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormat2Params *",
-   "name" : "android::DescribeColorFormat2Params *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorFormatParams *",
-   "name" : "android::DescribeColorFormatParams *",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2022",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2610",
-   "self_type" : "type-2609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2754",
-   "self_type" : "type-2753",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2886",
-   "self_type" : "type-2885",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2078",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-458",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2702",
-   "self_type" : "type-2701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IMemory *",
-   "name" : "android::IMemory *",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2805",
-   "self_type" : "type-2804",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMX::ComponentInfo *",
-   "name" : "android::IOMX::ComponentInfo *",
-   "referenced_type" : "type-2928",
-   "self_type" : "type-2927",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXBufferSource *",
-   "name" : "android::IOMXBufferSource *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2579",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXNode *",
-   "name" : "android::IOMXNode *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
    "referenced_type" : "type-1103",
    "self_type" : "type-1102",
    "size" : 4,
@@ -19325,170 +17915,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1709",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2572",
+   "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "linker_set_key" : "android::ALooper *",
+   "name" : "android::ALooper *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IOMXObserver *",
-   "name" : "android::IOMXObserver *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IOmxNodeWrapper *",
-   "name" : "android::IOmxNodeWrapper *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2223",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<long long, long long> *",
-   "name" : "android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-1093",
    "self_type" : "type-1092",
    "size" : 4,
@@ -19496,3536 +17978,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-233",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2173",
-   "self_type" : "type-2172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node *",
-   "name" : "android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<String8>::_Node *",
-   "name" : "android::List<String8>::_Node *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::OMXPluginBase *> *",
-   "name" : "android::List<android::OMXPluginBase *> *",
-   "referenced_type" : "type-848",
-   "self_type" : "type-2288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::String8> *",
-   "name" : "android::List<android::String8> *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1294",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1941",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2543",
-   "self_type" : "type-2542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2700",
-   "self_type" : "type-2699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaCodecBuffer *",
-   "name" : "android::MediaCodecBuffer *",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage2 *",
-   "name" : "android::MediaImage2 *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MetadataBufferType *",
-   "name" : "android::MetadataBufferType *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-2070",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2492",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2638",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXBuffer *",
-   "name" : "android::OMXBuffer *",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2479",
-   "self_type" : "type-2478",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2779",
-   "self_type" : "type-2778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXFenceParcelable *",
-   "name" : "android::OMXFenceParcelable *",
-   "referenced_type" : "type-2908",
-   "self_type" : "type-2907",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXMaster *",
-   "name" : "android::OMXMaster *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance *",
-   "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
-   "name" : "android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2522",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OmxGraphicBufferSource *",
-   "name" : "android::OmxGraphicBufferSource *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1541",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2857",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2827",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2763",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1243",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-741",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-286",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
-   "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1132",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1086",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1171",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1194",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1237",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::ErrnoRestorer *",
-   "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-1311",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1324",
-   "self_type" : "type-1323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2061",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2691",
-   "self_type" : "type-2690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2840",
-   "self_type" : "type-2839",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-3125",
-   "self_type" : "type-3124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2697",
-   "self_type" : "type-2696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2339",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2695",
-   "self_type" : "type-2694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-2844",
-   "self_type" : "type-2843",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1846",
-   "self_type" : "type-1845",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1959",
-   "self_type" : "type-1958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2537",
-   "self_type" : "type-2536",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2812",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2625",
-   "self_type" : "type-2624",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1428",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2486",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2637",
-   "self_type" : "type-2636",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2517",
-   "self_type" : "type-2516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2704",
-   "self_type" : "type-2703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2520",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2708",
-   "self_type" : "type-2707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx *",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2498",
-   "self_type" : "type-2497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1094",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2669",
-   "self_type" : "type-2668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-2824",
-   "self_type" : "type-2823",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2848",
-   "self_type" : "type-2847",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1731",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2177",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2519",
-   "self_type" : "type-2518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
-   "name" : "android::hardware::media::omx::V1_0::Message *",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2654",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-2578",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-2747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-2822",
-   "self_type" : "type-2821",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2828",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3112",
-   "self_type" : "type-3111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1216",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
-   "name" : "android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-238",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-2901",
-   "self_type" : "type-2900",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::omx_message *",
-   "name" : "android::omx_message *",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
-   "name" : "android::sp<ANativeWindowBuffer> *",
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-84",
    "self_type" : "type-83",
    "size" : 4,
@@ -23033,10 +18041,4915 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AMessage *",
+   "name" : "android::AMessage *",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AReplyToken *",
+   "name" : "android::AReplyToken *",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3065",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::AString *",
+   "name" : "android::AString *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
+   "name" : "android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-339",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-330",
+   "self_type" : "type-442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXBufferSource> *",
+   "name" : "android::BnInterface<android::IOMXBufferSource> *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXNode> *",
+   "name" : "android::BnInterface<android::IOMXNode> *",
+   "referenced_type" : "type-319",
+   "self_type" : "type-444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IOMXObserver> *",
+   "name" : "android::BnInterface<android::IOMXObserver> *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpRefBase *",
+   "name" : "android::BpRefBase *",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-72",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormat2Params *",
+   "name" : "android::DescribeColorFormat2Params *",
+   "referenced_type" : "type-596",
+   "self_type" : "type-626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::DescribeColorFormatParams *",
+   "name" : "android::DescribeColorFormatParams *",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1924",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2128",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-642",
+   "self_type" : "type-641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IMemory *",
+   "name" : "android::IMemory *",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2619",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMX::ComponentInfo *",
+   "name" : "android::IOMX::ComponentInfo *",
+   "referenced_type" : "type-2908",
+   "self_type" : "type-2907",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXBufferSource *",
+   "name" : "android::IOMXBufferSource *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXNode *",
+   "name" : "android::IOMXNode *",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOMXObserver *",
+   "name" : "android::IOMXObserver *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IOmxNodeWrapper *",
+   "name" : "android::IOmxNodeWrapper *",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<long long, long long> *",
+   "name" : "android::KeyedVector<long long, long long> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-197",
+   "self_type" : "type-214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-761",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-348",
+   "self_type" : "type-347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Plugin>::_Node *",
+   "name" : "android::List<Plugin>::_Node *",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<String8>::_Node *",
+   "name" : "android::List<String8>::_Node *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin> *",
+   "name" : "android::List<android::OMXMaster::Plugin> *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::String8> *",
+   "name" : "android::List<android::String8> *",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaCodecBuffer *",
+   "name" : "android::MediaCodecBuffer *",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MediaImage2 *",
+   "name" : "android::MediaImage2 *",
+   "referenced_type" : "type-597",
+   "self_type" : "type-609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::MetadataBufferType *",
+   "name" : "android::MetadataBufferType *",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-2046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2768",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXBuffer *",
+   "name" : "android::OMXBuffer *",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2881",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXFenceParcelable *",
+   "name" : "android::OMXFenceParcelable *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXMaster *",
+   "name" : "android::OMXMaster *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance *",
+   "name" : "android::OMXNodeInstance *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer *",
+   "name" : "android::OMXNodeInstance::ActiveBuffer *",
+   "referenced_type" : "type-136",
+   "self_type" : "type-215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-1710",
+   "self_type" : "type-1709",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcher *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "name" : "android::OMXNodeInstance::CallbackDispatcherThread *",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OmxGraphicBufferSource *",
+   "name" : "android::OmxGraphicBufferSource *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-797",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-98",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-250",
+   "self_type" : "type-249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2823",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2795",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2725",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "name" : "android::SortedVector<OMX_INDEXTYPE> *",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> > *",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
+   "referenced_type" : "type-723",
+   "self_type" : "type-724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-254",
+   "self_type" : "type-266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::String8> *",
+   "name" : "android::Vector<android::String8> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1106",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1060",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1208",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1145",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1176",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-1285",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-631",
+   "self_type" : "type-630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2508",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2787",
+   "self_type" : "type-2786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-2791",
+   "self_type" : "type-2790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-806",
+   "self_type" : "type-805",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2596",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_handle *",
+   "name" : "android::hardware::hidl_handle *",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2454",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2610",
+   "self_type" : "type-2609",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "name" : "android::hardware::media::omx::V1_0::CodecBuffer *",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IGraphicBufferSource *",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2467",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "name" : "android::hardware::media::omx::V1_0::IOmx::ComponentInfo *",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2897",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxBufferSource *",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxNode *",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxObserver *",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::IOmxStore *",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2430",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2591",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::Message *",
+   "name" : "android::hardware::media::omx::V1_0::Message *",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource *",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode *",
+   "referenced_type" : "type-945",
+   "self_type" : "type-2550",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver *",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore *",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource *",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxBufferSource *",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource::TWOmxNodeWrapper *",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode *",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-2721",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2789",
+   "self_type" : "type-2788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2629",
+   "self_type" : "type-2628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
+   "name" : "android::hidl::memory::V1_0::IMemory *",
+   "referenced_type" : "type-3086",
+   "self_type" : "type-3085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
+   "referenced_type" : "type-144",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<long long, long long> *",
+   "name" : "android::key_value_pair_t<long long, long long> *",
+   "referenced_type" : "type-147",
+   "self_type" : "type-218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
+   "referenced_type" : "type-688",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2593",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::omx_message *",
+   "name" : "android::omx_message *",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<ANativeWindowBuffer> *",
+   "name" : "android::sp<ANativeWindowBuffer> *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> *",
    "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23044,8 +22957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23053,8 +22966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-136",
+   "referenced_type" : "type-57",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23062,8 +22975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23071,8 +22984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-51",
+   "referenced_type" : "type-22",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23080,96 +22993,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IMemory> *",
-   "name" : "android::sp<android::IMemory> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-25",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
-   "name" : "android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3102",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXNode> *",
-   "name" : "android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-1109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOMXObserver> *",
-   "name" : "android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3042",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
-   "name" : "android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1091",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::NativeHandle> *",
-   "name" : "android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 4,
@@ -23177,10 +23000,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-640",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IMemory> *",
+   "name" : "android::sp<android::IMemory> *",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXBufferSource> *",
+   "name" : "android::sp<android::IOMXBufferSource> *",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXNode> *",
+   "name" : "android::sp<android::IOMXNode> *",
+   "referenced_type" : "type-589",
+   "self_type" : "type-1083",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOMXObserver> *",
+   "name" : "android::sp<android::IOMXObserver> *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper> *",
+   "name" : "android::sp<android::IOmxNodeWrapper> *",
+   "referenced_type" : "type-677",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-524",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
    "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-148",
+   "referenced_type" : "type-124",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23188,8 +23101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OMXNodeInstance> *",
    "name" : "android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3154",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23197,8 +23110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::OmxGraphicBufferSource> *",
    "name" : "android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23206,8 +23119,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-3130",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23215,8 +23128,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-3123",
-   "self_type" : "type-3127",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23224,8 +23137,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-75",
-   "self_type" : "type-79",
+   "referenced_type" : "type-39",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23233,8 +23146,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-56",
-   "self_type" : "type-60",
+   "referenced_type" : "type-32",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23242,8 +23155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23251,8 +23164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23260,8 +23173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-3148",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-3122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23269,8 +23182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23278,8 +23191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-2960",
+   "referenced_type" : "type-946",
+   "self_type" : "type-2942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23287,8 +23200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-938",
+   "self_type" : "type-3120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23296,8 +23209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23305,8 +23218,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-503",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23314,8 +23227,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-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23323,8 +23236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23332,8 +23245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-808",
+   "referenced_type" : "type-61",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23341,8 +23254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-371",
+   "referenced_type" : "type-67",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23350,8 +23263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23359,8 +23272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1964",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -23368,8 +23281,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23377,8 +23290,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-109",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -23386,8 +23299,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_CALLBACKTYPE *",
    "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -23395,8 +23308,8 @@
    "alignment" : 4,
    "linker_set_key" : "const OMX_INDEXTYPE *",
    "name" : "const OMX_INDEXTYPE *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-244",
+   "referenced_type" : "type-201",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23404,8 +23317,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ABuffer *",
    "name" : "const android::ABuffer *",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2938",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -23413,8 +23326,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-787",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -23422,8 +23335,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -23431,8 +23344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3067",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -23440,8 +23353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -23449,8 +23362,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-361",
+   "referenced_type" : "type-338",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23458,8 +23371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-353",
+   "referenced_type" : "type-329",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23467,8 +23380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource> *",
    "name" : "const android::BnInterface<android::IOMXBufferSource> *",
-   "referenced_type" : "type-2873",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2846",
+   "self_type" : "type-2847",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23476,8 +23389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode> *",
    "name" : "const android::BnInterface<android::IOMXNode> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-344",
+   "referenced_type" : "type-318",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23485,8 +23398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver> *",
    "name" : "const android::BnInterface<android::IOMXObserver> *",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2723",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -23494,8 +23407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-316",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -23503,8 +23416,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23512,8 +23425,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23521,8 +23434,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23530,8 +23443,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23539,8 +23452,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23548,96 +23461,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1746",
-   "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-2049",
-   "self_type" : "type-2052",
-   "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-2187",
-   "self_type" : "type-2189",
-   "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-2329",
-   "self_type" : "type-2331",
-   "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-2530",
-   "self_type" : "type-2532",
-   "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-2687",
-   "self_type" : "type-2689",
-   "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-2836",
-   "self_type" : "type-2838",
-   "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-42",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemory *",
-   "name" : "const android::IMemory *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IMemoryHeap *",
-   "name" : "const android::IMemoryHeap *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2698",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IOMXBufferSource *",
-   "name" : "const android::IOMXBufferSource *",
    "referenced_type" : "type-1715",
    "self_type" : "type-1717",
    "size" : 4,
@@ -23645,10 +23468,100 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-21",
+   "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-2018",
+   "self_type" : "type-2020",
+   "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-2156",
+   "self_type" : "type-2158",
+   "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-2301",
+   "self_type" : "type-2304",
+   "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-2500",
+   "self_type" : "type-2502",
+   "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-2659",
+   "self_type" : "type-2661",
+   "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-2810",
+   "self_type" : "type-2812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemory *",
+   "name" : "const android::IMemory *",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IMemoryHeap *",
+   "name" : "const android::IMemoryHeap *",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::IOMXBufferSource *",
    "name" : "const android::IOMXBufferSource *",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IOMXBufferSource *",
+   "name" : "const android::IOMXBufferSource *",
+   "referenced_type" : "type-3081",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23656,8 +23569,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IOmxNodeWrapper *",
    "name" : "const android::IOmxNodeWrapper *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-704",
+   "referenced_type" : "type-685",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23665,8 +23578,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-496",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23674,8 +23587,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23683,8 +23596,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-924",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23692,8 +23605,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23701,8 +23614,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23710,8 +23623,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<long long, long long> *",
    "name" : "const android::KeyedVector<long long, long long> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
+   "referenced_type" : "type-500",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23719,8 +23632,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -23728,8 +23641,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-223",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -23737,26 +23650,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-216",
+   "referenced_type" : "type-187",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2259",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node *",
-   "name" : "const android::List<OMXPluginBase *>::_Node *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2238",
+   "linker_set_key" : "const android::List<Plugin>::_Node *",
+   "name" : "const android::List<Plugin>::_Node *",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23764,8 +23677,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR> *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23773,8 +23686,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23782,8 +23695,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<String8>::_Node *",
    "name" : "const android::List<String8>::_Node *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23791,8 +23704,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23800,8 +23713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
+   "referenced_type" : "type-770",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23809,8 +23722,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::String8> *",
    "name" : "const android::List<android::String8> *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23818,8 +23731,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-564",
+   "referenced_type" : "type-544",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23827,8 +23740,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance *",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3159",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23836,8 +23749,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer *",
    "name" : "const android::OMXNodeInstance::ActiveBuffer *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-246",
+   "referenced_type" : "type-225",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23845,8 +23758,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23854,8 +23767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-427",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23863,8 +23776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23872,8 +23785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23881,8 +23794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23890,8 +23803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23899,8 +23812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23908,8 +23821,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23917,8 +23830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23926,8 +23839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23935,8 +23848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23944,8 +23857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2718",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23953,8 +23866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23962,8 +23875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23971,8 +23884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -23980,8 +23893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23989,8 +23902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2782",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2744",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -23998,8 +23911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24007,8 +23920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE> *",
    "name" : "const android::SortedVector<OMX_INDEXTYPE> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-294",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24016,8 +23929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> > *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-303",
+   "referenced_type" : "type-282",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24025,8 +23938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24034,8 +23947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > > *",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24043,8 +23956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> > *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24052,8 +23965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > > *",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24061,8 +23974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> > *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-291",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24070,8 +23983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> > *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-299",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24079,8 +23992,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-742",
-   "self_type" : "type-744",
+   "referenced_type" : "type-725",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24088,8 +24001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-282",
+   "referenced_type" : "type-262",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24097,8 +24010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24106,8 +24019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-300",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24115,8 +24028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-305",
+   "self_type" : "type-306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24124,8 +24037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24133,8 +24046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24142,8 +24055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24151,8 +24064,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-373",
-   "self_type" : "type-374",
+   "referenced_type" : "type-354",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24160,8 +24073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -24169,8 +24082,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-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24178,8 +24091,26 @@
    "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-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24187,8 +24118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24196,8 +24127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode *",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode *",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24205,8 +24136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24214,8 +24145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24223,8 +24154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24232,8 +24163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
    "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24241,8 +24172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-240",
+   "referenced_type" : "type-208",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24250,8 +24181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24259,8 +24190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24268,8 +24199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *> *",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24277,8 +24208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24286,8 +24217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long> *",
    "name" : "const android::key_value_pair_t<long long, long long> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-241",
+   "referenced_type" : "type-212",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24295,8 +24226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-239",
+   "referenced_type" : "type-206",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24304,8 +24235,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-714",
-   "self_type" : "type-718",
+   "referenced_type" : "type-696",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24313,8 +24244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ABuffer> *",
    "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24322,8 +24253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-55",
+   "referenced_type" : "type-27",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24331,8 +24262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-41",
+   "referenced_type" : "type-14",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24340,8 +24271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-645",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24349,8 +24280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IMemory> *",
    "name" : "const android::sp<android::IMemory> *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-29",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24358,8 +24289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource> *",
    "name" : "const android::sp<android::IOMXBufferSource> *",
-   "referenced_type" : "type-3103",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24367,8 +24298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXNode> *",
    "name" : "const android::sp<android::IOMXNode> *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-623",
+   "referenced_type" : "type-588",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24376,8 +24307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOMXObserver> *",
    "name" : "const android::sp<android::IOMXObserver> *",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24385,8 +24316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper> *",
    "name" : "const android::sp<android::IOmxNodeWrapper> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24394,8 +24325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-562",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24403,42 +24334,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher> *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
-   "name" : "const android::sp<android::OMXNodeInstance> *",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "referenced_type" : "type-3136",
    "self_type" : "type-3137",
    "size" : 4,
@@ -24446,10 +24341,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OMXNodeInstance> *",
+   "name" : "const android::sp<android::OMXNodeInstance> *",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "name" : "const android::sp<android::OmxGraphicBufferSource> *",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3111",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-3128",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24457,8 +24388,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-80",
-   "self_type" : "type-81",
+   "referenced_type" : "type-46",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24466,8 +24397,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-73",
-   "self_type" : "type-74",
+   "referenced_type" : "type-37",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24475,8 +24406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-502",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24484,8 +24415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource> *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24493,8 +24424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx> *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-3149",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24502,8 +24433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource> *",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24511,8 +24442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode> *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-2990",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-2971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24520,8 +24451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver> *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-937",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24529,8 +24460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore> *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24538,8 +24469,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-521",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24547,8 +24478,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-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24556,8 +24487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24565,8 +24496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-441",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24574,8 +24505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24583,26 +24514,17 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24610,8 +24532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-256",
+   "referenced_type" : "type-107",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24619,8 +24541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24628,8 +24550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24637,8 +24559,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-1264",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24646,8 +24568,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-1392",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24655,8 +24577,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-2151",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24664,8 +24586,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-2250",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24673,8 +24595,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-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24682,8 +24604,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24691,8 +24613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-416",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24700,8 +24622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "type-369",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -24709,8 +24631,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-94",
+   "self_type" : "type-2762",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24718,8 +24640,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -24727,8 +24649,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-572",
+   "referenced_type" : "type-108",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -24736,8 +24658,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -24745,8 +24667,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle **",
    "name" : "native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-541",
+   "referenced_type" : "type-152",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24754,8 +24676,8 @@
    "alignment" : 4,
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24763,8 +24685,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -24773,7 +24695,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-4",
-   "self_type" : "type-161",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -24782,7 +24704,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-540",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24790,8 +24712,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24799,8 +24721,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-411",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -24808,8 +24730,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24817,8 +24739,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-125",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-96",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -24830,8 +24752,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *const",
    "name" : "OMX_BUFFERHEADERTYPE *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-229",
+   "referenced_type" : "type-139",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24840,8 +24762,8 @@
    "is_const" : true,
    "linker_set_key" : "OMX_COMPONENTTYPE *const",
    "name" : "OMX_COMPONENTTYPE *const",
-   "referenced_type" : "type-859",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24850,8 +24772,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-254",
-   "self_type" : "type-332",
+   "referenced_type" : "type-235",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -24860,8 +24782,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXNodeInstance *const",
    "name" : "android::OMXNodeInstance *const",
-   "referenced_type" : "type-841",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-824",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24870,8 +24792,8 @@
    "is_const" : true,
    "linker_set_key" : "android::OMXPluginBase *const",
    "name" : "android::OMXPluginBase *const",
-   "referenced_type" : "type-851",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24880,8 +24802,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24890,8 +24812,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24900,8 +24822,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24910,8 +24832,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24920,8 +24842,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24930,8 +24852,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24940,8 +24862,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24950,8 +24872,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24960,8 +24882,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24970,8 +24892,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2358",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24980,8 +24902,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24990,8 +24912,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25000,8 +24922,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-269",
-   "self_type" : "type-271",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25010,8 +24932,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2709",
-   "self_type" : "type-2711",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25020,8 +24942,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25030,8 +24952,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "type-705",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25040,8 +24962,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-89",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25050,8 +24972,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_CALLBACKTYPE",
    "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-880",
+   "self_type" : "type-2303",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h"
   },
@@ -25060,8 +24982,8 @@
    "is_const" : true,
    "linker_set_key" : "const OMX_INDEXTYPE",
    "name" : "const OMX_INDEXTYPE",
-   "referenced_type" : "type-154",
-   "self_type" : "type-221",
+   "referenced_type" : "type-134",
+   "self_type" : "type-201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25070,8 +24992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ABuffer",
    "name" : "const android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-56",
+   "self_type" : "type-2934",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
   },
@@ -25080,8 +25002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h"
   },
@@ -25090,8 +25012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-69",
+   "self_type" : "type-3062",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
   },
@@ -25100,8 +25022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3066",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25110,8 +25032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-74",
+   "self_type" : "type-2339",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25120,8 +25042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-339",
+   "self_type" : "type-338",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25130,8 +25052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25140,8 +25062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXBufferSource>",
    "name" : "const android::BnInterface<android::IOMXBufferSource>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-740",
+   "self_type" : "type-2846",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25150,8 +25072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXNode>",
    "name" : "const android::BnInterface<android::IOMXNode>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25160,8 +25082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IOMXObserver>",
    "name" : "const android::BnInterface<android::IOMXObserver>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-2722",
+   "referenced_type" : "type-326",
+   "self_type" : "type-2691",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25170,8 +25092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-331",
-   "self_type" : "type-336",
+   "referenced_type" : "type-312",
+   "self_type" : "type-316",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -25180,8 +25102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorAspects",
    "name" : "const android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25190,8 +25112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormat2Params",
    "name" : "const android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-642",
+   "referenced_type" : "type-596",
+   "self_type" : "type-624",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25200,8 +25122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::DescribeColorFormatParams",
    "name" : "const android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-645",
+   "referenced_type" : "type-623",
+   "self_type" : "type-627",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -25210,8 +25132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25220,8 +25142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25230,8 +25152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25240,8 +25162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25250,8 +25172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25270,8 +25192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25280,8 +25202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25290,8 +25212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25300,8 +25222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25310,8 +25232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25320,8 +25242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25330,8 +25252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25340,8 +25262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemory",
    "name" : "const android::IMemory",
-   "referenced_type" : "type-19",
-   "self_type" : "type-30",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-3144",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25350,8 +25272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IMemoryHeap",
    "name" : "const android::IMemoryHeap",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h"
   },
@@ -25360,8 +25282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25370,8 +25292,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25380,8 +25302,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25390,8 +25312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1996",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25400,8 +25322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25410,8 +25332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25420,8 +25342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2616",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25430,8 +25352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25440,8 +25362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMX::ComponentInfo",
    "name" : "const android::IOMX::ComponentInfo",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25450,8 +25372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25460,8 +25382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOMXBufferSource",
    "name" : "const android::IOMXBufferSource",
-   "referenced_type" : "type-3108",
-   "self_type" : "type-3107",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25470,8 +25392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IOmxNodeWrapper",
    "name" : "const android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-703",
+   "referenced_type" : "type-679",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25480,8 +25402,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-514",
+   "referenced_type" : "type-495",
+   "self_type" : "type-496",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25490,8 +25412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-840",
+   "self_type" : "type-2197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25500,8 +25422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-949",
+   "referenced_type" : "type-892",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25510,8 +25432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "const android::KeyedVector<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-837",
+   "self_type" : "type-2191",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25520,8 +25442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-945",
+   "referenced_type" : "type-819",
+   "self_type" : "type-921",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25530,8 +25452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<long long, long long>",
    "name" : "const android::KeyedVector<long long, long long>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-519",
+   "referenced_type" : "type-499",
+   "self_type" : "type-500",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25540,8 +25462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -25550,8 +25472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-220",
+   "referenced_type" : "type-197",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -25560,29 +25482,29 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-206",
+   "referenced_type" : "type-149",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2252",
+   "linker_set_key" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "const android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::List<OMXPluginBase *>::_Node",
-   "name" : "const android::List<OMXPluginBase *>::_Node",
-   "referenced_type" : "type-850",
-   "self_type" : "type-2237",
-   "size" : 12,
+   "linker_set_key" : "const android::List<Plugin>::_Node",
+   "name" : "const android::List<Plugin>::_Node",
+   "referenced_type" : "type-833",
+   "self_type" : "type-2218",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
@@ -25590,8 +25512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25600,8 +25522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "const android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25610,8 +25532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<String8>::_Node",
    "name" : "const android::List<String8>::_Node",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25620,8 +25542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-782",
-   "self_type" : "type-785",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25630,8 +25552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-791",
+   "referenced_type" : "type-762",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25640,8 +25562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::String8>",
    "name" : "const android::List<android::String8>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-343",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25650,8 +25572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::MediaImage",
    "name" : "const android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -25660,8 +25582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-170",
-   "self_type" : "type-563",
+   "referenced_type" : "type-151",
+   "self_type" : "type-544",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25670,8 +25592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25680,8 +25602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25690,18 +25612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXBuffer",
-   "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -25710,8 +25622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2018",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25720,8 +25632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25730,8 +25642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2490",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25740,8 +25652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -25750,8 +25662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2791",
-   "self_type" : "type-2790",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25760,8 +25672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25770,18 +25682,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXBuffer",
    "name" : "const android::OMXBuffer",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXBuffer",
+   "name" : "const android::OMXBuffer",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
+   "size" : 64,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25790,8 +25712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25800,8 +25722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25810,8 +25732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25820,8 +25742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25830,8 +25752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2598",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25840,8 +25762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2628",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2750",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -25850,28 +25772,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXFenceParcelable",
    "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::OMXFenceParcelable",
-   "name" : "const android::OMXFenceParcelable",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::OMXFenceParcelable",
+   "name" : "const android::OMXFenceParcelable",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::OMXMaster::Plugin",
+   "name" : "const android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-2213",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-825",
+   "self_type" : "type-3132",
    "size" : 304,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25880,8 +25812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::OMXNodeInstance::ActiveBuffer",
    "name" : "const android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-245",
+   "referenced_type" : "type-136",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25890,8 +25822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-428",
-   "self_type" : "type-454",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25900,8 +25832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25910,8 +25842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-426",
+   "self_type" : "type-427",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -25920,8 +25852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-422",
-   "self_type" : "type-425",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
@@ -25930,8 +25862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25940,8 +25872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25950,8 +25882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25960,8 +25892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25970,8 +25902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25980,8 +25912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2144",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25990,8 +25922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26000,8 +25932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26010,8 +25942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26020,8 +25952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2720",
-   "self_type" : "type-2719",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26030,8 +25962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26040,8 +25972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26050,8 +25982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26060,8 +25992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-21",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-87",
+   "self_type" : "type-2165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26070,8 +26002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -26080,8 +26012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::SortedVector<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-294",
+   "self_type" : "type-295",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26090,8 +26022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<OMX_INDEXTYPE>",
    "name" : "const android::SortedVector<OMX_INDEXTYPE>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-293",
+   "referenced_type" : "type-270",
+   "self_type" : "type-274",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26100,8 +26032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-302",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26110,8 +26042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-841",
+   "self_type" : "type-1894",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26120,8 +26052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-893",
+   "self_type" : "type-1221",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26130,8 +26062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1883",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26140,8 +26072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-837",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-820",
+   "self_type" : "type-1218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26150,8 +26082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-310",
+   "referenced_type" : "type-285",
+   "self_type" : "type-291",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26160,8 +26092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26170,8 +26102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
+   "referenced_type" : "type-723",
+   "self_type" : "type-725",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -26180,8 +26112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-272",
-   "self_type" : "type-281",
+   "referenced_type" : "type-254",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -26190,8 +26122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-365",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-346",
+   "self_type" : "type-1760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26200,8 +26132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "const android::Vector<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-298",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26210,8 +26142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-325",
+   "referenced_type" : "type-303",
+   "self_type" : "type-305",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26220,8 +26152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26230,8 +26162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-291",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-272",
+   "self_type" : "type-1876",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -26240,8 +26172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -26250,8 +26182,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-370",
-   "self_type" : "type-373",
+   "referenced_type" : "type-350",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -26260,8 +26192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2584",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -26270,8 +26202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26280,8 +26212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26290,8 +26222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26300,8 +26232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26310,8 +26242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26320,8 +26252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2618",
-   "self_type" : "type-2617",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2588",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26330,8 +26262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2759",
-   "self_type" : "type-2758",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26340,8 +26272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-2893",
-   "self_type" : "type-2892",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26350,8 +26282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::media::omx::V1_0::Status>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26360,8 +26292,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26370,8 +26302,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-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26380,8 +26312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26390,8 +26322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26400,8 +26332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26410,8 +26342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26420,8 +26352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26430,18 +26362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::hidl_handle",
-   "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2597",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2569",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26450,8 +26372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2781",
-   "self_type" : "type-2780",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2756",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26460,18 +26382,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-2881",
-   "self_type" : "type-2880",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_handle",
+   "name" : "const android::hardware::hidl_handle",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26480,8 +26412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26490,8 +26422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
   },
@@ -26500,8 +26432,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2572",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26510,8 +26442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h"
   },
@@ -26520,8 +26452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::omx::V1_0::Message>",
-   "referenced_type" : "type-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2723",
+   "self_type" : "type-2722",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -26530,8 +26462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-2588",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26540,8 +26472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26550,8 +26482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26560,8 +26492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26570,8 +26502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26580,8 +26512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26590,8 +26522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2495",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2464",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26600,8 +26532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26610,8 +26542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2796",
-   "self_type" : "type-2795",
+   "referenced_type" : "type-2771",
+   "self_type" : "type-2770",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26620,8 +26552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::CodecBuffer",
    "name" : "const android::hardware::media::omx::V1_0::CodecBuffer",
-   "referenced_type" : "type-2920",
-   "self_type" : "type-2919",
+   "referenced_type" : "type-2895",
+   "self_type" : "type-2894",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26630,8 +26562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26640,18 +26572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26660,8 +26582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26670,8 +26592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26680,8 +26602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h"
   },
@@ -26690,8 +26612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26700,8 +26622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
-   "referenced_type" : "type-2785",
-   "self_type" : "type-2784",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26710,98 +26632,128 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
    "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "name" : "const android::hardware::media::omx::V1_0::ColorAspects",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2621",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "referenced_type" : "type-2783",
+   "self_type" : "type-2782",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
+   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
    "referenced_type" : "type-2910",
    "self_type" : "type-2909",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-1664",
-   "self_type" : "type-1663",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2036",
-   "self_type" : "type-2035",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2505",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2651",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "name" : "const android::hardware::media::omx::V1_0::IOmx::ComponentInfo",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26810,8 +26762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26820,8 +26772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::IOmxNode",
    "name" : "const android::hardware::media::omx::V1_0::IOmxNode",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26830,8 +26782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26840,8 +26792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26850,8 +26802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26860,8 +26812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26870,8 +26822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2438",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26880,8 +26832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2604",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -26890,8 +26842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26900,8 +26852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2877",
+   "self_type" : "type-2876",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26910,8 +26862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Message",
    "name" : "const android::hardware::media::omx::V1_0::Message",
-   "referenced_type" : "type-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26920,8 +26872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26930,8 +26882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26940,8 +26892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26950,8 +26902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26960,8 +26912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26970,8 +26922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26980,8 +26932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2730",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -26990,8 +26942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-2890",
-   "self_type" : "type-2889",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27000,8 +26952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::omx::V1_0::Status",
    "name" : "const android::hardware::media::omx::V1_0::Status",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27010,8 +26962,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-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27020,8 +26972,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-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27030,8 +26982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27040,8 +26992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
    "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-3120",
-   "self_type" : "type-3119",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27050,8 +27002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "const android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-227",
+   "referenced_type" : "type-144",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27060,8 +27012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-842",
+   "self_type" : "type-1732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27070,8 +27022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1186",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27080,8 +27032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "const android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27090,8 +27042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "const android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27100,8 +27052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<long long, long long>",
    "name" : "const android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-231",
+   "referenced_type" : "type-147",
+   "self_type" : "type-212",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27110,8 +27062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "const android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-224",
+   "referenced_type" : "type-138",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27120,8 +27072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-714",
+   "referenced_type" : "type-688",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27130,8 +27082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27140,8 +27092,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27150,8 +27102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27160,8 +27112,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27170,8 +27122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27180,8 +27132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2465",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2433",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27190,8 +27142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h"
   },
@@ -27200,8 +27152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2765",
-   "self_type" : "type-2764",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27210,8 +27162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27220,8 +27172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -27230,8 +27182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::omx_message",
    "name" : "const android::omx_message",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-963",
+   "self_type" : "type-962",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h"
   },
@@ -27239,16 +27191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
-   "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-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -27256,18 +27200,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-84",
-   "self_type" : "type-2952",
+   "referenced_type" : "type-49",
+   "self_type" : "type-2925",
    "size" : 4,
    "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-620",
+   "self_type" : "type-619",
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ABuffer>",
    "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-89",
-   "self_type" : "type-134",
+   "referenced_type" : "type-54",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27276,8 +27228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-383",
+   "referenced_type" : "type-122",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27286,8 +27238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-138",
+   "referenced_type" : "type-57",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27296,8 +27248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-45",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27306,8 +27258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-37",
+   "referenced_type" : "type-10",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27316,8 +27268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-663",
+   "referenced_type" : "type-640",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27326,8 +27278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IMemory>",
    "name" : "const android::sp<android::IMemory>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-26",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27336,8 +27288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXBufferSource>",
    "name" : "const android::sp<android::IOMXBufferSource>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-3103",
+   "referenced_type" : "type-909",
+   "self_type" : "type-3076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27346,8 +27298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXNode>",
    "name" : "const android::sp<android::IOMXNode>",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27356,8 +27308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOMXObserver>",
    "name" : "const android::sp<android::IOMXObserver>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-900",
+   "self_type" : "type-3039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27366,8 +27318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IOmxNodeWrapper>",
    "name" : "const android::sp<android::IOmxNodeWrapper>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-699",
+   "referenced_type" : "type-677",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27376,8 +27328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::NativeHandle>",
    "name" : "const android::sp<android::NativeHandle>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-558",
+   "referenced_type" : "type-524",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27386,8 +27338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-904",
+   "self_type" : "type-3136",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27396,8 +27348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
    "name" : "const android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
+   "referenced_type" : "type-124",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27406,8 +27358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OMXNodeInstance>",
    "name" : "const android::sp<android::OMXNodeInstance>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-823",
+   "self_type" : "type-3129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27416,8 +27368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::OmxGraphicBufferSource>",
    "name" : "const android::sp<android::OmxGraphicBufferSource>",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27426,8 +27378,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-3130",
-   "self_type" : "type-3136",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27436,8 +27388,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-3123",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27446,8 +27398,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-75",
-   "self_type" : "type-80",
+   "referenced_type" : "type-39",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27456,8 +27408,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-56",
-   "self_type" : "type-73",
+   "referenced_type" : "type-32",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27466,8 +27418,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-489",
-   "self_type" : "type-499",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27476,8 +27428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27486,8 +27438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmx>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27496,8 +27448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27506,8 +27458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-946",
+   "self_type" : "type-1562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27516,8 +27468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27526,8 +27478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "const android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27536,8 +27488,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-503",
-   "self_type" : "type-521",
+   "referenced_type" : "type-484",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27498,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-566",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-548",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27556,8 +27508,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3116",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27566,8 +27518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-427",
+   "referenced_type" : "type-67",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27576,8 +27528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27586,8 +27538,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-86",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27596,8 +27548,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-69",
-   "self_type" : "type-131",
+   "referenced_type" : "type-76",
+   "self_type" : "type-102",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27606,28 +27558,18 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-130",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-101",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27636,8 +27578,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-124",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27646,8 +27588,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-123",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27656,8 +27598,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-67",
-   "self_type" : "type-955",
+   "referenced_type" : "type-60",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27666,8 +27608,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -27676,8 +27618,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-114",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-81",
+   "self_type" : "type-1813",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27686,8 +27628,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-2943",
+   "referenced_type" : "type-153",
+   "self_type" : "type-2917",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -27696,8 +27638,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1796",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27706,8 +27648,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27716,8 +27658,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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27668,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27736,8 +27678,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27746,8 +27688,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27756,8 +27698,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-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2714",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27766,8 +27708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
    "name" : "const std::list<android::omx_message, std::allocator<android::omx_message> >",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h"
   },
@@ -27776,8 +27718,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27786,8 +27728,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27796,8 +27738,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-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27806,8 +27748,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-2247",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27816,18 +27758,38 @@
    "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-2737",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2711",
+   "self_type" : "type-2710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-4",
-   "self_type" : "type-435",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27837,7 +27799,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-292",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27846,8 +27808,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-430",
-   "self_type" : "type-437",
+   "referenced_type" : "type-409",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27856,8 +27818,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-112",
+   "self_type" : "type-1801",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27865,8 +27827,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-126",
-   "self_type" : "type-388",
+   "referenced_type" : "type-97",
+   "self_type" : "type-369",
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
@@ -27874,8 +27836,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-119",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-86",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -27903,13 +27865,13 @@
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1907",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -27935,18 +27897,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2096",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -27977,18 +27939,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1993",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -28019,23 +27981,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -28061,17 +28023,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nModulationDepth",
@@ -28081,13 +28043,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2453",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -28113,13 +28075,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2553"
+     "referenced_type" : "type-2528"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -28145,28 +28107,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -28192,13 +28154,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -28224,17 +28186,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -28254,12 +28216,12 @@
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nTrack0031MuteMask",
@@ -28284,8 +28246,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -28316,13 +28278,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -28358,13 +28320,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -28415,8 +28377,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -28447,12 +28409,12 @@
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nUserSoundBankIndex",
@@ -28462,8 +28424,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -28489,7 +28451,7 @@
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nDuration",
@@ -28504,7 +28466,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -28519,13 +28481,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1739"
+     "referenced_type" : "type-1720"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -28551,13 +28513,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1938",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -28583,13 +28545,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2644",
-   "self_type" : "type-2644",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -28615,47 +28577,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "nDensity",
@@ -28670,13 +28632,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2515",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -28702,12 +28664,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "nStereoWidening",
@@ -28717,8 +28679,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -28744,18 +28706,18 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -28781,18 +28743,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1659"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -28853,23 +28815,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-2398"
+     "referenced_type" : "type-2387"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2388",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -28910,8 +28872,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -28947,23 +28909,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2480"
+     "referenced_type" : "type-2492"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-2488"
+     "referenced_type" : "type-2499"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2469"
+     "referenced_type" : "type-2487"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2505",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -28994,12 +28956,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29014,23 +28976,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-983",
-   "self_type" : "type-983",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -29071,8 +29033,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -29103,28 +29065,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-2440"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -29155,13 +29117,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2453"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -29192,18 +29154,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2472"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2482",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -29229,18 +29191,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-3017",
-   "self_type" : "type-3017",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3001",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -29266,18 +29228,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -29303,18 +29265,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-2515",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -29350,23 +29312,23 @@
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1338"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -29397,23 +29359,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-1244"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1205"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -29459,18 +29421,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2372"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2377",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -29501,17 +29463,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-927"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-767"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitPerSample",
@@ -29526,18 +29488,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2364"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2363",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -29568,18 +29530,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-593",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -29610,18 +29572,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-559",
+   "self_type" : "type-559",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -29652,18 +29614,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -29694,13 +29656,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -29731,7 +29693,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29746,8 +29708,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -29783,7 +29745,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29798,8 +29760,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -29860,13 +29822,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2412"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -29922,23 +29884,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2414"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -29969,12 +29931,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-712"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMinBitRate",
@@ -29989,23 +29951,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -30036,18 +29998,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -30078,18 +30040,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -30145,23 +30107,23 @@
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -30187,7 +30149,7 @@
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nBitRate",
@@ -30197,12 +30159,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2400"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nSamplingRate",
@@ -30212,12 +30174,12 @@
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nSuperBlockAlign",
@@ -30227,8 +30189,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -30239,28 +30201,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-782"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -30271,23 +30233,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -30313,8 +30275,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -30335,7 +30297,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "nAllocLen",
@@ -30355,32 +30317,32 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nTickCount",
@@ -30390,7 +30352,7 @@
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nFlags",
@@ -30410,8 +30372,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -30422,23 +30384,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-881"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-900"
+     "referenced_type" : "type-884"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
+   "referenced_type" : "type-880",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -30449,18 +30411,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -30481,108 +30443,108 @@
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-845"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-851"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-854"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-875"
+     "referenced_type" : "type-859"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-879"
+     "referenced_type" : "type-863"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-868"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-871"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-873"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-891"
+     "referenced_type" : "type-875"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-893"
+     "referenced_type" : "type-877"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-886"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -30608,12 +30570,12 @@
     {
      "field_name" : "cName",
      "field_offset" : 96,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 1120,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nParamCount",
@@ -30628,13 +30590,13 @@
     {
      "field_name" : "param",
      "field_offset" : 1216,
-     "referenced_type" : "type-2671"
+     "referenced_type" : "type-2644"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2643",
    "size" : 416,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
@@ -30645,27 +30607,27 @@
    [
     {
      "field_name" : "cKey",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueType",
      "field_offset" : 1024,
-     "referenced_type" : "type-2663"
+     "referenced_type" : "type-2636"
     },
     {
      "field_name" : "bSet",
      "field_offset" : 1056,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_offset" : 1088,
-     "referenced_type" : "type-2665"
+     "referenced_type" : "type-2638"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 264,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
@@ -30676,23 +30638,23 @@
    [
     {
      "field_name" : "nInt32",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nInt64",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "cString",
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
    "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
@@ -30728,8 +30690,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-3114",
-   "self_type" : "type-3114",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3088",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -30750,13 +30712,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -30787,8 +30749,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-3101",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3078",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -30814,12 +30776,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFrameLimit",
@@ -30829,8 +30791,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -30861,13 +30823,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2961"
+     "referenced_type" : "type-2935"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2963",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2936",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -30893,18 +30855,18 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2713"
+     "referenced_type" : "type-2696"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-2715"
+     "referenced_type" : "type-2698"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2712",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2695",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -30930,7 +30892,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCustomizedU",
@@ -30945,8 +30907,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2926",
+   "self_type" : "type-2926",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -30982,8 +30944,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2932",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -31004,7 +30966,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31019,8 +30981,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -31041,7 +31003,7 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nParentNodeID",
@@ -31061,18 +31023,18 @@
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -31098,13 +31060,13 @@
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-3094",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3071",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -31130,13 +31092,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -31162,13 +31124,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3061"
+     "referenced_type" : "type-3038"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3073",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3050",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -31194,12 +31156,12 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-128"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nApertureFNumber",
@@ -31209,7 +31171,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -31219,7 +31181,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nSensitivity",
@@ -31229,13 +31191,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -31261,53 +31223,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -31338,8 +31300,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -31365,13 +31327,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3029",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3014",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -31397,13 +31359,13 @@
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3122",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3100",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -31429,13 +31391,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2933"
+     "referenced_type" : "type-2912"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2944",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2918",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -31461,13 +31423,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -31493,13 +31455,13 @@
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-3144",
-   "self_type" : "type-3144",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3119",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -31530,13 +31492,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-561",
+   "self_type" : "type-561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -31562,13 +31524,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-563",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -31589,7 +31551,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31604,8 +31566,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-984",
-   "self_type" : "type-984",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -31626,7 +31588,7 @@
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-944"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -31641,12 +31603,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-958"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -31656,17 +31618,17 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "nValueMaxSize",
@@ -31681,13 +31643,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -31713,13 +31675,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2977"
+     "referenced_type" : "type-2956"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2989",
-   "self_type" : "type-2989",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2970",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -31755,8 +31717,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3150",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3124",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -31782,18 +31744,18 @@
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2998",
-   "self_type" : "type-2998",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2980",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -31819,12 +31781,12 @@
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nWidth",
@@ -31839,8 +31801,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-3007",
-   "self_type" : "type-3007",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2990",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -31866,13 +31828,13 @@
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2969",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2946",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -31898,13 +31860,13 @@
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-3134",
-   "self_type" : "type-3134",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3110",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -31930,18 +31892,18 @@
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2888",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2872",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -31967,13 +31929,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-3152"
+     "referenced_type" : "type-3126"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-3153",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3127",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -31999,13 +31961,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-3041"
+     "referenced_type" : "type-3027"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3028",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -32041,8 +32003,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2964",
-   "self_type" : "type-2964",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2937",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -32068,7 +32030,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "nFocusSteps",
@@ -32083,8 +32045,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -32110,13 +32072,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-601"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-605",
+   "self_type" : "type-605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -32142,23 +32104,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-646"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-659"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -32189,18 +32151,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-594",
+   "self_type" : "type-594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -32231,8 +32193,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -32258,18 +32220,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-638"
+     "referenced_type" : "type-629"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-634",
+   "self_type" : "type-634",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -32280,12 +32242,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -32300,7 +32262,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -32310,28 +32272,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -32342,18 +32304,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -32379,13 +32341,13 @@
     {
      "field_name" : "eNaluFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
    "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_NALSTREAMFORMATTYPE"
@@ -32406,13 +32368,13 @@
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -32433,8 +32395,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -32460,7 +32422,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-2091"
+     "referenced_type" : "type-2071"
     },
     {
      "field_name" : "nDataSize",
@@ -32470,13 +32432,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -32507,13 +32469,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -32524,13 +32486,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -32556,13 +32518,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -32583,13 +32545,13 @@
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -32610,13 +32572,13 @@
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-926",
+   "self_type" : "type-926",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -32637,13 +32599,13 @@
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -32706,13 +32668,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-3018",
-   "self_type" : "type-3018",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3002",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -32738,58 +32700,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-171"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -32815,7 +32777,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -32825,8 +32787,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3125",
+   "self_type" : "type-3125",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -32857,8 +32819,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -32879,12 +32841,12 @@
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-932"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -32894,7 +32856,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -32904,18 +32866,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-866"
+     "referenced_type" : "type-850"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1020",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -32941,7 +32903,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-716"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -32961,27 +32923,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-757"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-780"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -32991,8 +32953,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -33003,27 +32965,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-781"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-202"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-584"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-748"
     }
    ],
    "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-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-780",
+   "self_type" : "type-780",
    "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)"
@@ -33054,18 +33016,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-2937"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3060",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -33086,13 +33048,13 @@
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-800"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -33113,13 +33075,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-814"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -33150,8 +33112,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -33182,8 +33144,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -33214,8 +33176,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -33236,13 +33198,13 @@
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -33263,13 +33225,13 @@
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-709"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -33290,17 +33252,17 @@
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWaitMask",
@@ -33310,8 +33272,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -33337,23 +33299,23 @@
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -33374,13 +33336,13 @@
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -33401,13 +33363,13 @@
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-702"
+     "referenced_type" : "type-691"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -33433,13 +33395,13 @@
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -33465,38 +33427,38 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-707"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -33512,13 +33474,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-883"
+     "referenced_type" : "type-867"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-866",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -33604,8 +33566,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-470",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
@@ -33631,7 +33593,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33646,18 +33608,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 224,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33693,8 +33655,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -33725,8 +33687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -33757,8 +33719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -33784,7 +33746,7 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileWidth",
@@ -33809,8 +33771,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
@@ -33836,7 +33798,7 @@
     {
      "field_name" : "eSupportedPatterns",
      "field_offset" : 96,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nLayerCountMax",
@@ -33851,7 +33813,7 @@
     {
      "field_name" : "ePattern",
      "field_offset" : 192,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-471"
     },
     {
      "field_name" : "nPLayerCountActual",
@@ -33866,18 +33828,18 @@
     {
      "field_name" : "bBitrateRatiosSpecified",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nBitrateRatios",
      "field_offset" : 320,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
@@ -33908,7 +33870,7 @@
     {
      "field_name" : "eTemporalPattern",
      "field_offset" : 128,
-     "referenced_type" : "type-474"
+     "referenced_type" : "type-455"
     },
     {
      "field_name" : "nTemporalLayerCount",
@@ -33918,7 +33880,7 @@
     {
      "field_name" : "nTemporalLayerBitrateRatio",
      "field_offset" : 192,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "nMinQuantizer",
@@ -33933,8 +33895,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
    "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
@@ -33970,13 +33932,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-569"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -34017,7 +33979,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nRefFrames",
@@ -34037,32 +33999,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-526"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34072,22 +34034,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -34097,17 +34059,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -34117,13 +34079,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -34149,17 +34111,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-248"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-253"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -34181,8 +34143,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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "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)"
@@ -34208,12 +34170,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -34223,12 +34185,12 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
@@ -34270,17 +34232,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34290,7 +34252,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -34305,8 +34267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -34332,12 +34294,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-463"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-464"
     },
     {
      "field_name" : "nKeyFrameInterval",
@@ -34347,8 +34309,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
    "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
@@ -34374,7 +34336,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     },
     {
      "field_name" : "nAirMBs",
@@ -34394,8 +34356,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -34421,33 +34383,33 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -34483,7 +34445,7 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
      "field_name" : "eLevel",
@@ -34493,8 +34455,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -34525,12 +34487,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPFrames",
@@ -34550,7 +34512,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -34565,12 +34527,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-440"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-450"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -34585,13 +34547,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -34622,12 +34584,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xFramerate",
@@ -34637,8 +34599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -34679,8 +34641,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -34721,8 +34683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -34748,22 +34710,22 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "nFrameRate",
@@ -34788,23 +34750,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -34830,43 +34792,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -34892,7 +34854,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nFirstGOB",
@@ -34912,8 +34874,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -34939,12 +34901,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-449"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-451"
     },
     {
      "field_name" : "nDCTPartitions",
@@ -34954,13 +34916,13 @@
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
    "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
@@ -34986,17 +34948,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bErrorResilientMode",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nTileRows",
@@ -35011,13 +34973,13 @@
     {
      "field_name" : "bEnableFrameParallelDecoding",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
    "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
@@ -35043,13 +35005,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-472"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -35060,12 +35022,12 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "nFrameWidth",
@@ -35080,7 +35042,7 @@
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nSliceHeight",
@@ -35100,28 +35062,28 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -35132,18 +35094,18 @@
    [
     {
      "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "nSystemTimeNs",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
    "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
@@ -35169,18 +35131,18 @@
     {
      "field_name" : "bDepedentSegments",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bEnableLoopFilterAcrossSlices",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
    "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
@@ -35206,18 +35168,18 @@
     {
      "field_name" : "bIsIntraFrame",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bIsGoldenOrAlternateFrame",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
@@ -35243,38 +35205,38 @@
     {
      "field_name" : "bPreviousFrameRefresh",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bGoldenFrameRefresh",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bAlternateFrameRefresh",
      "field_offset" : 160,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUsePreviousFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseGoldenFrame",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bUseAlternateFrame",
      "field_offset" : 256,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
    "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
    "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
@@ -35284,7 +35246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35293,13 +35255,13 @@
      "access" : "private",
      "field_name" : "mMeta",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -35323,19 +35285,19 @@
      "access" : "private",
      "field_name" : "mInt32Data",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsData",
      "field_offset" : 256,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::ABuffer",
    "name" : "android::ABuffer",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 36,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
    "unique_id" : "_ZTSN7android7ABufferE",
@@ -35374,8 +35336,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-3087",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3061",
    "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"
@@ -35384,8 +35346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -35395,7 +35357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35404,19 +35366,19 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -35428,13 +35390,13 @@
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-788",
+   "self_type" : "type-788",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -35478,7 +35440,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35487,55 +35449,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-77"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-82"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -35577,18 +35539,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -35598,7 +35560,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35613,25 +35575,25 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-95"
+     "referenced_type" : "type-61"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
@@ -35642,8 +35604,8 @@
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -35685,12 +35647,12 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     },
     {
      "field_name" : "mNameLength",
@@ -35700,13 +35662,13 @@
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -35717,11 +35679,11 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "sizeValue",
@@ -35729,35 +35691,35 @@
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-98"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-99"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-100"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -35768,28 +35730,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -35799,7 +35761,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -35808,25 +35770,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3091",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3064",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -35868,7 +35830,7 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
@@ -35885,8 +35847,8 @@
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -35896,7 +35858,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-236"
     }
    ],
    "fields" :
@@ -35905,20 +35867,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -36039,20 +36001,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-341" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36247,20 +36209,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-352" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36488,20 +36450,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-335"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -36753,20 +36715,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-738"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferSource>",
    "name" : "android::BnInterface<android::IGraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-757" ],
+   "template_args" : [ "type-739" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_20IGraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -36958,20 +36920,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2686"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemory>",
    "name" : "android::BnInterface<android::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-2717",
-   "self_type" : "type-2717",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2685",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2686" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_7IMemoryEEE",
    "vtable_components" :
    [
@@ -37123,20 +37085,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2684"
+     "referenced_type" : "type-2652"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IMemoryHeap>",
    "name" : "android::BnInterface<android::IMemoryHeap>",
    "record_kind" : "class",
-   "referenced_type" : "type-2706",
-   "self_type" : "type-2706",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2684" ],
+   "template_args" : [ "type-2652" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_11IMemoryHeapEEE",
    "vtable_components" :
    [
@@ -37304,20 +37266,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-741"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXBufferSource>",
    "name" : "android::BnInterface<android::IOMXBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-740",
+   "self_type" : "type-740",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-742" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16IOMXBufferSourceEEE",
    "vtable_components" :
    [
@@ -37485,20 +37447,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXNode>",
    "name" : "android::BnInterface<android::IOMXNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-343" ],
+   "template_args" : [ "type-323" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_8IOMXNodeEEE",
    "vtable_components" :
    [
@@ -37721,20 +37683,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-327"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IOMXObserver>",
    "name" : "android::BnInterface<android::IOMXObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-347" ],
+   "template_args" : [ "type-328" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_12IOMXObserverEEE",
    "vtable_components" :
    [
@@ -37886,20 +37848,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1234"
     },
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-321"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1235" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -38081,14 +38043,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2717"
+     "referenced_type" : "type-2685"
     }
    ],
    "linker_set_key" : "android::BnMemory",
    "name" : "android::BnMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-2716",
-   "self_type" : "type-2716",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android8BnMemoryE",
@@ -38245,14 +38207,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2706"
+     "referenced_type" : "type-2670"
     }
    ],
    "linker_set_key" : "android::BnMemoryHeap",
    "name" : "android::BnMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2705",
-   "self_type" : "type-2705",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2669",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android12BnMemoryHeapE",
@@ -38426,7 +38388,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -38435,26 +38397,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-313"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-314"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -38543,28 +38505,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-985"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-986"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-987"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-988"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -38573,8 +38535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3096",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3069",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -38583,8 +38545,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -38596,14 +38558,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-73"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -38629,7 +38591,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -38639,13 +38601,13 @@
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2929",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -38671,12 +38633,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nPixelFormat",
@@ -38691,13 +38653,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-984"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2957",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2930",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -38718,7 +38680,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38743,18 +38705,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-597"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-596",
+   "self_type" : "type-596",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -38775,7 +38737,7 @@
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "nFrameWidth",
@@ -38800,18 +38762,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-611"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -38847,13 +38809,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-562"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2933",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -38879,13 +38841,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2934"
+     "referenced_type" : "type-2901"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2958",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2931",
+   "self_type" : "type-2931",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -38911,13 +38873,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2939",
+   "referenced_type" : "type-2913",
+   "self_type" : "type-2913",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -38927,11 +38889,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -38939,11 +38901,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-391" ],
+   "template_args" : [ "type-371" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -38951,11 +38913,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-373" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -38963,11 +38925,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
+   "template_args" : [ "type-383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -38975,11 +38937,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-399" ],
+   "template_args" : [ "type-380" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -38987,11 +38949,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-397" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -38999,11 +38961,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -39011,11 +38973,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-408" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -39023,8 +38985,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -39055,8 +39017,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2953",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2927",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -39067,17 +39029,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2935"
+     "referenced_type" : "type-2902"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2936"
+     "referenced_type" : "type-2903"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2901",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -39088,15 +39050,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2937"
+     "referenced_type" : "type-2904"
     }
    ],
    "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-2936",
-   "self_type" : "type-2936",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2903",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -39107,18 +39069,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2938",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2905",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -39129,48 +39091,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2938"
+     "referenced_type" : "type-2905"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2937",
-   "self_type" : "type-2937",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2904",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -39181,14 +39143,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -39317,14 +39279,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -39405,14 +39367,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -39492,14 +39454,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemory",
    "name" : "android::IMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android7IMemoryE",
@@ -39586,14 +39548,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-439"
     }
    ],
    "linker_set_key" : "android::IMemoryHeap",
    "name" : "android::IMemoryHeap",
    "record_kind" : "class",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IMemory.h",
    "unique_id" : "_ZTSN7android11IMemoryHeapE",
@@ -39696,13 +39658,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "linker_set_key" : "android::IOmxNodeWrapper",
    "name" : "android::IOmxNodeWrapper",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/IOmxNodeWrapper.h",
    "unique_id" : "_ZTSN7android15IOmxNodeWrapperE",
@@ -39752,17 +39714,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -39772,17 +39734,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39792,17 +39754,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-893"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-841", "type-911" ],
+   "template_args" : [ "type-824", "type-895" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -39812,17 +39774,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-854"
+     "referenced_type" : "type-838"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "name" : "android::KeyedVector<android::String8, android::OMXPluginBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -39832,17 +39794,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-837"
+     "referenced_type" : "type-820"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::KeyedVector<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-839", "type-840" ],
+   "template_args" : [ "type-822", "type-823" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -39852,17 +39814,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-776" ],
+   "template_args" : [ "type-60", "type-759" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -39872,17 +39834,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-67", "type-774" ],
+   "template_args" : [ "type-60", "type-756" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -39892,17 +39854,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::KeyedVector<long long, long long>",
    "name" : "android::KeyedVector<long long, long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIxxEE"
   },
   {
@@ -39912,17 +39874,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-277"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -39932,14 +39894,14 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -39950,11 +39912,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
+   "template_args" : [ "type-390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -39962,11 +39924,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
+   "template_args" : [ "type-392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -39974,11 +39936,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-415" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -39986,11 +39948,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-417" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -39998,17 +39960,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-419" ],
+   "template_args" : [ "type-398" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -40016,17 +39978,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-402" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -40036,17 +39998,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-198"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -40056,17 +40018,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-169"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -40076,29 +40038,29 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2116"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2139" ],
+   "template_args" : [ "type-2117" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "name" : "android::List<OMXPluginBase *>::NON_CONST_ITERATOR<android::OMXPluginBase *>",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "linker_set_key" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "name" : "android::List<Plugin>::NON_CONST_ITERATOR<android::OMXMaster::Plugin>",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE18NON_CONST_ITERATORIS2_EE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE18NON_CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 4,
@@ -40106,18 +40068,18 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<OMXPluginBase *>::_ListIterator<android::OMXPluginBase *, android::List<OMXPluginBase *>::NON_CONST_ITERATOR>",
+   "linker_set_key" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
+   "name" : "android::List<Plugin>::_ListIterator<android::OMXMaster::Plugin, android::List<Plugin>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
    "access" : "protected",
@@ -40127,50 +40089,50 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-834"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "field_offset" : 64,
+     "referenced_type" : "type-832"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-849"
+     "field_offset" : 96,
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<OMXPluginBase *>::_Node",
-   "name" : "android::List<OMXPluginBase *>::_Node",
+   "linker_set_key" : "android::List<Plugin>::_Node",
+   "name" : "android::List<Plugin>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 12,
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
+   "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEE5_NodeE"
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEE5_NodeE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE14CONST_ITERATORIS1_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
    "name" : "android::List<String8>::NON_CONST_ITERATOR<android::String8>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE18NON_CONST_ITERATORIS1_EE"
   },
   {
@@ -40179,17 +40141,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1254"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_14CONST_ITERATOREEE"
   },
   {
@@ -40198,17 +40160,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "name" : "android::List<String8>::_ListIterator<android::String8, android::List<String8>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE"
   },
   {
@@ -40219,26 +40181,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::List<String8>::_Node",
    "name" : "android::List<String8>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_7String8EE5_NodeE"
@@ -40251,26 +40213,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-765"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -40283,17 +40245,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-80" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -40322,17 +40284,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-776"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-799" ],
+   "template_args" : [ "type-778" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -40361,17 +40323,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-763"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-784" ],
+   "template_args" : [ "type-766" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -40400,18 +40362,18 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-832"
     }
    ],
-   "linker_set_key" : "android::List<android::OMXPluginBase *>",
-   "name" : "android::List<android::OMXPluginBase *>",
+   "linker_set_key" : "android::List<android::OMXMaster::Plugin>",
+   "name" : "android::List<android::OMXMaster::Plugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-851" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_13OMXPluginBaseEEE",
+   "template_args" : [ "type-834" ],
+   "unique_id" : "_ZTSN7android4ListINS_9OMXMaster6PluginEEE",
    "vtable_components" :
    [
     {
@@ -40419,15 +40381,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_13OMXPluginBaseEEE"
+     "mangled_component_name" : "_ZTIN7android4ListINS_9OMXMaster6PluginEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED1Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_13OMXPluginBaseEED0Ev"
+     "mangled_component_name" : "_ZN7android4ListINS_9OMXMaster6PluginEED0Ev"
     }
    ]
   },
@@ -40439,17 +40401,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "android::List<android::String8>",
    "name" : "android::List<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android4ListINS_7String8EEE",
    "vtable_components" :
    [
@@ -40478,17 +40440,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-773"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -40515,100 +40477,16 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-913"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-119"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-914"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-915"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-916"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-917"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-918"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-919"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-921"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-922"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-923"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-924"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-925"
+     "field_name" : "mImpl",
+     "referenced_type" : "type-897"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
    "name" : "android::MediaCodecsXmlParser",
    "record_kind" : "class",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
-   "size" : 139384,
+   "referenced_type" : "type-896",
+   "self_type" : "type-896",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -40618,7 +40496,7 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "order",
@@ -40628,29 +40506,39 @@
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-503"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-504"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-505"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-526"
+     "field_offset" : 352,
+     "referenced_type" : "type-506"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-527"
+     "field_offset" : 448,
+     "referenced_type" : "type-507"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-528"
+     "field_offset" : 544,
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 56,
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -40660,18 +40548,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-511"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-512"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -40682,23 +40570,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-515"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"
@@ -40709,7 +40597,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-612"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40734,13 +40622,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-613"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-611",
+   "self_type" : "type-611",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -40751,7 +40639,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "mNumPlanes",
@@ -40781,13 +40669,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-599"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -40803,12 +40691,12 @@
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "mHorizSubsampling",
@@ -40823,8 +40711,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -40860,8 +40748,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -40873,14 +40761,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -40892,14 +40780,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2077"
+     "referenced_type" : "type-2055"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2076",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -40909,7 +40797,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-149"
     }
    ],
    "fields" :
@@ -40918,20 +40806,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -40941,7 +40829,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "fields" :
@@ -40950,44 +40838,38 @@
      "access" : "private",
      "field_name" : "mProcessName",
      "field_offset" : 32,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mPlugins",
      "field_offset" : 192,
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByComponentName",
      "field_offset" : 256,
-     "referenced_type" : "type-853"
+     "referenced_type" : "type-837"
     },
     {
      "access" : "private",
      "field_name" : "mPluginByInstance",
      "field_offset" : 416,
-     "referenced_type" : "type-856"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVendorLibHandle",
-     "field_offset" : 576,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::OMXMaster",
    "name" : "android::OMXMaster",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 76,
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
    "unique_id" : "_ZTSN7android9OMXMasterE",
    "vtable_components" :
@@ -41022,11 +40904,34 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mOmx",
+     "referenced_type" : "type-835"
+    },
+    {
+     "field_name" : "mLibHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-96"
+    }
+   ],
+   "linker_set_key" : "android::OMXMaster::Plugin",
+   "name" : "android::OMXMaster::Plugin",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h",
+   "unique_id" : "_ZTSN7android9OMXMaster6PluginE"
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-920"
     }
    ],
    "fields" :
@@ -41035,61 +40940,61 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 160,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-826"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 192,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mObserver",
      "field_offset" : 224,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     },
     {
      "access" : "private",
      "field_name" : "mDispatcher",
      "field_offset" : 256,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-904"
     },
     {
      "access" : "private",
      "field_name" : "mDying",
      "field_offset" : 288,
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-908"
     },
     {
      "access" : "private",
      "field_name" : "mSailed",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mQueriedProhibitedExtensions",
      "field_offset" : 304,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mProhibitedExtensions",
      "field_offset" : 320,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mIsSecure",
      "field_offset" : 480,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41101,25 +41006,25 @@
      "access" : "private",
      "field_name" : "mOMXBufferSourceLock",
      "field_offset" : 544,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mOMXBufferSource",
      "field_offset" : 576,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     },
     {
      "access" : "private",
      "field_name" : "mActiveBuffers",
      "field_offset" : 608,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mBufferIDLock",
      "field_offset" : 768,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
@@ -41131,127 +41036,127 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 832,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 992,
-     "referenced_type" : "type-513"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mLegacyAdaptiveExperiment",
      "field_offset" : 1152,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mPortMode",
      "field_offset" : 1184,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-913"
     },
     {
      "access" : "private",
      "field_name" : "mMetadataType",
      "field_offset" : 1248,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-915"
     },
     {
      "access" : "private",
      "field_name" : "mSecureBufferType",
      "field_offset" : 1312,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-916"
     },
     {
      "access" : "private",
      "field_name" : "mGraphicBufferEnabled",
      "field_offset" : 1376,
-     "referenced_type" : "type-942"
+     "referenced_type" : "type-918"
     },
     {
      "access" : "private",
      "field_name" : "mOriginalTimeUs",
      "field_offset" : 1408,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
      "field_name" : "mRestorePtsFailed",
      "field_offset" : 1568,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mMaxTimestampGapUs",
      "field_offset" : 1600,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevOriginalTimeUs",
      "field_offset" : 1664,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mPrevModifiedTimeUs",
      "field_offset" : 1728,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 1792,
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-75"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG",
      "field_offset" : 1824,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mNumPortBuffers",
      "field_offset" : 1856,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLock",
      "field_offset" : 1920,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "DEBUG_BUMP",
      "field_offset" : 1952,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 1984,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 2144,
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mDebugLevelBumpPendingBuffers",
      "field_offset" : 2304,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-919"
     }
    ],
    "linker_set_key" : "android::OMXNodeInstance",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 304,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstanceE",
@@ -41476,8 +41381,8 @@
    ],
    "linker_set_key" : "android::OMXNodeInstance::ActiveBuffer",
    "name" : "android::OMXNodeInstance::ActiveBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "unique_id" : "_ZTSN7android15OMXNodeInstance12ActiveBufferE"
@@ -41486,8 +41391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -41531,14 +41436,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-795"
     }
    ],
    "linker_set_key" : "android::OmxGraphicBufferSource",
    "name" : "android::OmxGraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android22OmxGraphicBufferSourceE",
@@ -41580,13 +41485,13 @@
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -41610,7 +41515,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-408"
     },
     {
      "access" : "private",
@@ -41634,13 +41539,13 @@
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -41652,31 +41557,31 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -41688,8 +41593,8 @@
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -41702,13 +41607,13 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "protected",
@@ -41720,14 +41625,14 @@
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-86"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
@@ -41738,8 +41643,8 @@
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -41775,14 +41680,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -41792,14 +41697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -41809,8 +41714,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -41862,7 +41767,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -41877,8 +41782,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2948",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2922",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -41899,13 +41804,13 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2928",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -41917,14 +41822,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2095"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2094",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -41936,14 +41841,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -41955,14 +41860,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2099"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -41975,14 +41880,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -42022,8 +41927,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -42033,8 +41938,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -42044,8 +41949,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -42069,7 +41974,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -42078,17 +41983,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2800",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2833" ],
+   "template_args" : [ "type-2801" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -42283,7 +42188,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-330"
     }
    ],
    "fields" :
@@ -42292,17 +42197,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2772",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2810" ],
+   "template_args" : [ "type-2773" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -42532,14 +42437,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2350"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-2745",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2717",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -42549,11 +42454,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-2724",
-   "self_type" : "type-2724",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-2725" ],
+   "template_args" : [ "type-2694" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -42561,13 +42466,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-836"
     }
    ],
    "linker_set_key" : "android::SoftOMXPlugin",
    "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
    "unique_id" : "_ZTSN7android13SoftOMXPluginE",
@@ -42608,17 +42513,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "vtable_components" :
    [
@@ -42666,17 +42571,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<OMX_INDEXTYPE>",
    "name" : "android::SortedVector<OMX_INDEXTYPE>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android12SortedVectorI13OMX_INDEXTYPEEE",
    "vtable_components" :
    [
@@ -42724,17 +42629,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE",
    "vtable_components" :
    [
@@ -42782,17 +42687,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42840,17 +42745,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-910" ],
+   "template_args" : [ "type-894" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE",
    "vtable_components" :
    [
@@ -42898,17 +42803,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE",
    "vtable_components" :
    [
@@ -42956,17 +42861,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE",
    "vtable_components" :
    [
@@ -43014,17 +42919,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-748" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43072,17 +42977,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -43130,17 +43035,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "name" : "android::SortedVector<android::key_value_pair_t<long long, long long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIxxEEEE",
    "vtable_components" :
    [
@@ -43188,17 +43093,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE",
    "vtable_components" :
    [
@@ -43246,17 +43151,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -43303,14 +43208,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -43382,13 +43287,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2940",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2914",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -43400,14 +43305,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -43419,14 +43324,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-130"
+     "referenced_type" : "type-101"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -43437,7 +43342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-87"
     }
    ],
    "fields" :
@@ -43446,62 +43351,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-1798"
+     "referenced_type" : "type-1776"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-72"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2133"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-2156"
+     "referenced_type" : "type-2130"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -43606,23 +43511,23 @@
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-886"
+     "referenced_type" : "type-870"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2951"
+     "referenced_type" : "type-2924"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2950",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2923",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -43633,17 +43538,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::Vector<android::OMXNodeInstance::ActiveBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6VectorINS_15OMXNodeInstance12ActiveBufferEEE",
    "vtable_components" :
    [
@@ -43688,17 +43593,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-304" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -43743,17 +43648,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -43800,7 +43705,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
@@ -43812,20 +43717,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -43877,13 +43782,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2941"
+     "referenced_type" : "type-2915"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2919",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -43894,18 +43799,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-2942"
+     "referenced_type" : "type-2916"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2941",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2915",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -43916,18 +43821,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-152"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2921",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -43938,23 +43843,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-534"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2920",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -43964,14 +43869,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2115"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -43998,8 +43903,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3058",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -44008,8 +43913,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3057",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -44018,85 +43923,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::aggregate_traits<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::aggregate_traits<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
    "name" : "android::aggregate_traits<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::aggregate_traits<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<long long, long long>",
    "name" : "android::aggregate_traits<long long, long long>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIxxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::aggregate_traits<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -44107,13 +44012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3083"
+     "referenced_type" : "type-3056"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3055",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -44123,13 +44028,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3072"
+     "referenced_type" : "type-3045"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3071",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3044",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -44139,13 +44044,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3070"
+     "referenced_type" : "type-3043"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3069",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3042",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44155,13 +44060,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3067"
+     "referenced_type" : "type-3041"
     }
    ],
    "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-3066",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3040",
    "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"
@@ -44171,13 +44076,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3065"
+     "referenced_type" : "type-3037"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3036",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44187,13 +44092,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3058"
+     "referenced_type" : "type-3031"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44203,13 +44108,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3060"
+     "referenced_type" : "type-3033"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3032",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44219,13 +44124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3079"
+     "referenced_type" : "type-3052"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3051",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44235,13 +44140,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3077"
+     "referenced_type" : "type-3049"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3076",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3048",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -44251,13 +44156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3081"
+     "referenced_type" : "type-3054"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3080",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3053",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -44267,13 +44172,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3063"
+     "referenced_type" : "type-3035"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3062",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3034",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -44283,13 +44188,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3075"
+     "referenced_type" : "type-3047"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3074",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3046",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -44298,8 +44203,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -44310,21 +44215,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-109" ],
+   "template_args" : [ "type-75", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
   {
@@ -44333,21 +44238,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-109", "type-130" ],
+   "template_args" : [ "type-75", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
   {
@@ -44356,21 +44261,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-109" ],
+   "template_args" : [ "type-101", "type-75" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
   {
@@ -44379,21 +44284,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-130", "type-130" ],
+   "template_args" : [ "type-101", "type-101" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
   {
@@ -44402,21 +44307,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1207" ],
+   "template_args" : [ "type-1181", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -44425,21 +44330,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1207", "type-1231" ],
+   "template_args" : [ "type-1181", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -44448,21 +44353,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-434" ],
+   "template_args" : [ "type-413", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
   {
@@ -44471,21 +44376,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-434", "type-161" ],
+   "template_args" : [ "type-413", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
   {
@@ -44494,21 +44399,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1207" ],
+   "template_args" : [ "type-1204", "type-1181" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -44517,21 +44422,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-1231", "type-1231" ],
+   "template_args" : [ "type-1204", "type-1204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -44540,21 +44445,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-434" ],
+   "template_args" : [ "type-141", "type-413" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
   {
@@ -44563,21 +44468,21 @@
    [
     {
      "field_name" : "lhs",
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     },
     {
      "field_name" : "rhs",
      "field_offset" : 32,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-368"
     }
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-161", "type-161" ],
+   "template_args" : [ "type-141", "type-141" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
   {
@@ -44587,14 +44492,14 @@
     {
      "access" : "private",
      "field_name" : "saved_errno_",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -44606,14 +44511,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1215"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -44625,14 +44530,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -44644,14 +44549,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-812"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -44663,17 +44568,17 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "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-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-349" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -44683,26 +44588,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
@@ -44712,7 +44617,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2643"
+     "referenced_type" : "type-2626"
     }
    ],
    "fields" :
@@ -44720,13 +44625,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxBufferSource",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17LWOmxBufferSourceE",
@@ -44894,7 +44799,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-950"
     }
    ],
    "fields" :
@@ -44902,13 +44807,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxNode",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9LWOmxNodeE",
@@ -45121,7 +45026,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1079"
     }
    ],
    "fields" :
@@ -45129,13 +45034,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 128,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::LWOmxObserver",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13LWOmxObserverE",
@@ -45291,10 +45196,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-898"
     },
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-899"
     }
    ],
    "fields" :
@@ -45303,44 +45208,44 @@
      "access" : "protected",
      "field_name" : "mMaster",
      "field_offset" : 64,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-828"
     },
     {
      "access" : "protected",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "protected",
      "field_name" : "mLiveNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-836"
+     "referenced_type" : "type-819"
     },
     {
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 288,
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "protected",
      "field_name" : "mParser",
      "field_offset" : 448,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-896"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::Omx",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 139448,
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
+   "size" : 72,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation3OmxE",
    "vtable_components" :
    [
     {
-     "component_value" : 139440,
+     "component_value" : 64,
      "kind" : "vbase_offset"
     },
     {
@@ -45404,7 +45309,7 @@
      "mangled_component_name" : "_ZN7android8hardware5media3omx4V1_014implementation3Omx11serviceDiedEyRKNS_2wpINS_4hidl4base4V1_05IBaseEEE"
     },
     {
-     "component_value" : 139436,
+     "component_value" : 60,
      "kind" : "vbase_offset"
     },
     {
@@ -45439,11 +45344,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -139440,
+     "component_value" : -64,
      "kind" : "offset_to_top"
     },
     {
@@ -45477,7 +45382,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1433"
     }
    ],
    "fields" :
@@ -45486,31 +45391,31 @@
      "access" : "protected",
      "field_name" : "mParsingStatus",
      "field_offset" : 32,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1429"
     },
     {
      "access" : "protected",
      "field_name" : "mPrefix",
      "field_offset" : 64,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1430"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceAttributeList",
      "field_offset" : 192,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1431"
     },
     {
      "access" : "protected",
      "field_name" : "mRoleList",
      "field_offset" : 320,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1432"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
    "name" : "android::hardware::media::omx::V1_0::implementation::OmxStore",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation8OmxStoreE",
@@ -45631,7 +45536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1115"
     }
    ],
    "fields" :
@@ -45639,18 +45544,18 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1110"
     },
     {
      "field_name" : "mOmxBufferSource",
      "field_offset" : 64,
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1111"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWGraphicBufferSource",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WGraphicBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation21TWGraphicBufferSourceE",
@@ -45792,7 +45697,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2565"
+     "referenced_type" : "type-2540"
     }
    ],
    "fields" :
@@ -45800,13 +45705,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-909"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxBufferSource",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2539",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxBufferSource.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation17TWOmxBufferSourceE",
@@ -45930,7 +45835,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1074"
     }
    ],
    "fields" :
@@ -45938,13 +45843,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxNode",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxNode.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation9TWOmxNodeE",
@@ -46107,7 +46012,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-952"
     }
    ],
    "fields" :
@@ -46115,13 +46020,13 @@
     {
      "field_name" : "mBase",
      "field_offset" : 32,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-900"
     }
    ],
    "linker_set_key" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
    "name" : "android::hardware::media::omx::V1_0::implementation::TWOmxObserver",
-   "referenced_type" : "type-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/WOmxObserver.h",
    "unique_id" : "_ZTSN7android8hardware5media3omx4V1_014implementation13TWOmxObserverE",
@@ -46233,16 +46138,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2992"
+     "referenced_type" : "type-2964"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2991",
-   "self_type" : "type-2991",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2963",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-100" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46250,271 +46155,271 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2995"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2994",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2994"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2993",
-   "self_type" : "type-2993",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2996"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2995",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2993"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2992",
-   "self_type" : "type-2992",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2997"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-2996",
-   "self_type" : "type-2996",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-129" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2986"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2985",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2985"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2984",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2987"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-2986",
-   "self_type" : "type-2986",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2984"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2983",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2988"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2987",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-108" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2971"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2970",
-   "self_type" : "type-2970",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2972"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-2971",
-   "self_type" : "type-2971",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2974"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2973",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2975"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2974",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-2976"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-2975",
-   "self_type" : "type-2975",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-2967"
     }
    ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-2966",
    "self_type" : "type-2966",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2968" ],
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2966"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2965",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2968"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2967",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2965"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2964",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2969"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
+   "name" : "android::is_one_of<android::AMessage::Rect>",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2968",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-100" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2960"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2959",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2959"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2958",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2961"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2960",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2958"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2957",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2962"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::AString>",
+   "name" : "android::is_one_of<android::AString>",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2961",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-74" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2944"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2943",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2945"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2944",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-54" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2948"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2947",
+   "self_type" : "type-2947",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2949"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2948",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2950"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
+   "name" : "android::is_one_of<android::sp<android::AMessage>>",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2949",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-57" ],
+   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2940"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
+   "name" : "android::is_one_of<android::sp<android::RefBase>>",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2939",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-2941" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -46522,16 +46427,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3001"
+     "referenced_type" : "type-2974"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-3000",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46539,16 +46444,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3000"
+     "referenced_type" : "type-2973"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2999",
-   "self_type" : "type-2999",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2972",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46556,16 +46461,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3004"
+     "referenced_type" : "type-2977"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3003",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2976",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46573,16 +46478,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3003"
+     "referenced_type" : "type-2976"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3002",
-   "self_type" : "type-3002",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2975",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46590,16 +46495,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3005"
+     "referenced_type" : "type-2978"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2977",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46607,16 +46512,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3002"
+     "referenced_type" : "type-2975"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2974",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46624,16 +46529,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3006"
+     "referenced_type" : "type-2979"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3005",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2978",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -46641,16 +46546,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3011"
+     "referenced_type" : "type-2984"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3010",
-   "self_type" : "type-3010",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2983",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -46658,16 +46563,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3010"
+     "referenced_type" : "type-2983"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2982",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46675,16 +46580,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3009"
+     "referenced_type" : "type-2982"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3008",
-   "self_type" : "type-3008",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2981",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46692,16 +46597,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3014"
+     "referenced_type" : "type-2987"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3013",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2986",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46709,16 +46614,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3013"
+     "referenced_type" : "type-2986"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3012",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2985",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46726,16 +46631,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3015"
+     "referenced_type" : "type-2988"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-3014",
-   "self_type" : "type-3014",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2987",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -46743,16 +46648,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3012"
+     "referenced_type" : "type-2985"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2984",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -46760,101 +46665,101 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-2989"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<float>",
+   "name" : "android::is_one_of<float>",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2988",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-94" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3021"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3020",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3020"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3019",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3019"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3018",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3018"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3017",
+   "self_type" : "type-3017",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-3016"
     }
    ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
+   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3015",
    "self_type" : "type-3015",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-123" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3049"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3048",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3048"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3047",
-   "self_type" : "type-3047",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3047"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3046",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3046"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3045",
-   "self_type" : "type-3045",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3044"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3043",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -46862,16 +46767,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3052"
+     "referenced_type" : "type-3024"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3051",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3023",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -46879,270 +46784,270 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3051"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3050",
-   "self_type" : "type-3050",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3053"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3052",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3045"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3044",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3050"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3049",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3054"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3053",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-67" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3035"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3034",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3034"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3033",
-   "self_type" : "type-3033",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3033"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3032",
-   "self_type" : "type-3032",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3032"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3031",
-   "self_type" : "type-3031",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3038"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3037",
-   "self_type" : "type-3037",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3037"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3036",
-   "self_type" : "type-3036",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3039"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3038",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3031"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3030",
-   "self_type" : "type-3030",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3036"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3035",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-3040"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3039",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
      "referenced_type" : "type-3023"
     }
    ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "referenced_type" : "type-3022",
    "self_type" : "type-3022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3025"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
+   "name" : "android::is_one_of<int, sp<RefBase> >",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3024",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3017"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3016",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3022"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3021",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3026"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<int>",
+   "name" : "android::is_one_of<int>",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3025",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-60" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3008"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3007",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3007"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3006",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3006"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3005",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3005"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3004",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3011"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3010",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3010"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3009",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3012"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, sp<RefBase> >",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3011",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3004"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3003",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3009"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3008",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3013"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<long long>",
+   "name" : "android::is_one_of<long long>",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3012",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2995"
+    }
+   ],
+   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2994",
+   "size" : 1,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
@@ -47151,13 +47056,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3022"
+     "referenced_type" : "type-2994"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47168,13 +47073,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3021"
+     "referenced_type" : "type-2993"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3020",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2992",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47185,13 +47090,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3020"
+     "referenced_type" : "type-2992"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3019",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47202,13 +47107,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3026"
+     "referenced_type" : "type-2998"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47219,13 +47124,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3025"
+     "referenced_type" : "type-2997"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3024",
-   "self_type" : "type-3024",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2996",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47236,13 +47141,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3027"
+     "referenced_type" : "type-2999"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2998",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47253,13 +47158,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3024"
+     "referenced_type" : "type-2996"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3023",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2995",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47270,13 +47175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3028"
+     "referenced_type" : "type-3000"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-3027",
-   "self_type" : "type-3027",
+   "referenced_type" : "type-2999",
+   "self_type" : "type-2999",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "template_args" : [ "type-2" ],
@@ -47287,16 +47192,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2980"
+     "referenced_type" : "type-2953"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2979",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2952",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47304,16 +47209,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2979"
+     "referenced_type" : "type-2952"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-2978",
-   "self_type" : "type-2978",
+   "referenced_type" : "type-2951",
+   "self_type" : "type-2951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -47321,16 +47226,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2981"
+     "referenced_type" : "type-2954"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-2980",
-   "self_type" : "type-2980",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2953",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -47338,16 +47243,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2982"
+     "referenced_type" : "type-2955"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-2981",
-   "self_type" : "type-2981",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2954",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-125" ],
+   "template_args" : [ "type-96" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -47356,7 +47261,7 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "value",
@@ -47366,11 +47271,11 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "name" : "android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int>",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159", "type-2" ],
+   "template_args" : [ "type-139", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEE"
   },
   {
@@ -47379,21 +47284,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-843"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859", "type-851" ],
+   "template_args" : [ "type-843", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47402,21 +47307,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-824"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841", "type-1162" ],
+   "template_args" : [ "type-824", "type-1136" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -47425,21 +47330,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
    "name" : "android::key_value_pair_t<android::String8, android::OMXPluginBase *>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365", "type-851" ],
+   "template_args" : [ "type-346", "type-835" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEE"
   },
   {
@@ -47448,21 +47353,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1136"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
    "name" : "android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162", "type-840" ],
+   "template_args" : [ "type-1136", "type-823" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
@@ -47471,21 +47376,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-81"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<long long, long long>",
    "name" : "android::key_value_pair_t<long long, long long>",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114", "type-114" ],
+   "template_args" : [ "type-81", "type-81" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIxxEE"
   },
   {
@@ -47499,16 +47404,16 @@
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "name" : "android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-159" ],
+   "template_args" : [ "type-2", "type-139" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -47527,8 +47432,8 @@
    ],
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -47541,17 +47446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<ANativeWindowBuffer>",
    "name" : "android::sp<ANativeWindowBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-52" ],
    "unique_id" : "_ZTSN7android2spI19ANativeWindowBufferEE"
   },
   {
@@ -47561,17 +47466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::sp<android::ABuffer>",
    "name" : "android::sp<android::ABuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
   },
   {
@@ -47581,17 +47486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-670"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-689" ],
+   "template_args" : [ "type-672" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -47601,17 +47506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-83"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-118" ],
+   "template_args" : [ "type-85" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -47621,17 +47526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -47641,17 +47546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-94" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -47661,17 +47566,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-653"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-655" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -47681,17 +47586,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-48" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -47701,17 +47606,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::sp<android::FrameDropper>",
    "name" : "android::sp<android::FrameDropper>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-685" ],
+   "template_args" : [ "type-668" ],
    "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
   },
   {
@@ -47721,318 +47626,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "record_kind" : "class",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-681" ],
-   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-279" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IBinder>",
-   "name" : "android::sp<android::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
-   "name" : "android::sp<android::IGraphicBufferConsumer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-659"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
-   "name" : "android::sp<android::IGraphicBufferProducer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-661" ],
-   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-458"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IInterface>",
-   "name" : "android::sp<android::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IMemory>",
-   "name" : "android::sp<android::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-934"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
-   "name" : "android::sp<android::IOMXBufferSource>",
-   "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-936" ],
-   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-609"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXNode>",
-   "name" : "android::sp<android::IOMXNode>",
-   "record_kind" : "class",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-611" ],
-   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-929"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOMXObserver>",
-   "name" : "android::sp<android::IOMXObserver>",
-   "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-931" ],
-   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-696"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
-   "name" : "android::sp<android::IOmxNodeWrapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-697" ],
-   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1088"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::IProducerListener>",
-   "name" : "android::sp<android::IProducerListener>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1087",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1090" ],
-   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
-   "name" : "android::sp<android::MediaCodecBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1159" ],
-   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-538"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::NativeHandle>",
-   "name" : "android::sp<android::NativeHandle>",
-   "record_kind" : "class",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-11"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
    "referenced_type" : "type-10",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
    "alignment" : 4,
@@ -48041,18 +47646,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-662"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
-   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-147" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+   "template_args" : [ "type-664" ],
+   "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
    "alignment" : 4,
@@ -48061,18 +47666,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-259"
     }
    ],
-   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
-   "name" : "android::sp<android::OMXNodeInstance>",
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
+   "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-842" ],
-   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+   "template_args" : [ "type-260" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
    "alignment" : 4,
@@ -48081,18 +47686,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
-   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IBinder>",
+   "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-812" ],
-   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+   "template_args" : [ "type-236" ],
+   "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
    "alignment" : 4,
@@ -48101,18 +47706,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2157"
+     "referenced_type" : "type-802"
     }
    ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
+   "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2158" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+   "template_args" : [ "type-804" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
    "alignment" : 4,
@@ -48121,18 +47726,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3131"
+     "referenced_type" : "type-641"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
+   "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3130",
-   "self_type" : "type-3130",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3133" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+   "template_args" : [ "type-643" ],
+   "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
    "alignment" : 4,
@@ -48141,78 +47746,18 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3124"
+     "referenced_type" : "type-438"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
+   "linker_set_key" : "android::sp<android::IInterface>",
+   "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-3123",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3126" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "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-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-78" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-57"
-    }
-   ],
-   "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-56",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+   "template_args" : [ "type-439" ],
+   "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
    "alignment" : 4,
@@ -48224,14 +47769,374 @@
      "referenced_type" : "type-3139"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
-   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "linker_set_key" : "android::sp<android::IMemory>",
+   "name" : "android::sp<android::IMemory>",
    "record_kind" : "class",
    "referenced_type" : "type-3138",
    "self_type" : "type-3138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3141" ],
+   "template_args" : [ "type-2686" ],
+   "unique_id" : "_ZTSN7android2spINS_7IMemoryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-910"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXBufferSource>",
+   "name" : "android::sp<android::IOMXBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-912" ],
+   "unique_id" : "_ZTSN7android2spINS_16IOMXBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-590"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXNode>",
+   "name" : "android::sp<android::IOMXNode>",
+   "record_kind" : "class",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-592" ],
+   "unique_id" : "_ZTSN7android2spINS_8IOMXNodeEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-901"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOMXObserver>",
+   "name" : "android::sp<android::IOMXObserver>",
+   "record_kind" : "class",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-903" ],
+   "unique_id" : "_ZTSN7android2spINS_12IOMXObserverEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-678"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IOmxNodeWrapper>",
+   "name" : "android::sp<android::IOmxNodeWrapper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-679" ],
+   "unique_id" : "_ZTSN7android2spINS_15IOmxNodeWrapperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1062"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::IProducerListener>",
+   "name" : "android::sp<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1064" ],
+   "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::MediaCodecBuffer>",
+   "name" : "android::sp<android::MediaCodecBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1133" ],
+   "unique_id" : "_ZTSN7android2spINS_16MediaCodecBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-525"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::NativeHandle>",
+   "name" : "android::sp<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-151" ],
+   "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-905"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcher>",
+   "record_kind" : "class",
+   "referenced_type" : "type-904",
+   "self_type" : "type-904",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-907" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance18CallbackDispatcherEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-125"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "name" : "android::sp<android::OMXNodeInstance::CallbackDispatcherThread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-127" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstance24CallbackDispatcherThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-824"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OMXNodeInstance>",
+   "name" : "android::sp<android::OMXNodeInstance>",
+   "record_kind" : "class",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-825" ],
+   "unique_id" : "_ZTSN7android2spINS_15OMXNodeInstanceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-797"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::OmxGraphicBufferSource>",
+   "name" : "android::sp<android::OmxGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-794" ],
+   "unique_id" : "_ZTSN7android2spINS_22OmxGraphicBufferSourceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2131"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Thread>",
+   "name" : "android::sp<android::Thread>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2132" ],
+   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3105"
+    }
+   ],
+   "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-3104",
+   "self_type" : "type-3104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3107" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3097"
+    }
+   ],
+   "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-3096",
+   "self_type" : "type-3096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3099" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-40"
+    }
+   ],
+   "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-39",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-42" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-33"
+    }
+   ],
+   "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-32",
+   "self_type" : "type-32",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-476" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3113"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "name" : "android::sp<android::hardware::media::omx::V1_0::IGraphicBufferSource>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3112",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3115" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_020IGraphicBufferSourceEEE"
   },
   {
@@ -48241,17 +48146,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1324"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmx>",
    "record_kind" : "class",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1326" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_04IOmxEEE"
   },
   {
@@ -48261,17 +48166,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1140" ],
+   "template_args" : [ "type-1114" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_016IOmxBufferSourceEEE"
   },
   {
@@ -48281,17 +48186,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-947"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxNode>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-946",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-949" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_08IOmxNodeEEE"
   },
   {
@@ -48301,17 +48206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-939"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxObserver>",
    "record_kind" : "class",
-   "referenced_type" : "type-965",
-   "self_type" : "type-965",
+   "referenced_type" : "type-938",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-968" ],
+   "template_args" : [ "type-941" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_012IOmxObserverEEE"
   },
   {
@@ -48321,17 +48226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1331"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "name" : "android::sp<android::hardware::media::omx::V1_0::IOmxStore>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware5media3omx4V1_09IOmxStoreEEE"
   },
   {
@@ -48341,17 +48246,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-485"
     }
    ],
    "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-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -48361,17 +48266,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-549"
     }
    ],
    "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-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-569" ],
+   "template_args" : [ "type-551" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -48381,223 +48286,223 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3111"
+     "referenced_type" : "type-3085"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-3110",
-   "self_type" : "type-3110",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3113" ],
+   "template_args" : [ "type-3087" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_pointer<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_pointer<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android13trait_pointerIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<OMX_INDEXTYPE>",
    "name" : "android::trait_pointer<OMX_INDEXTYPE>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android13trait_pointerI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance *>",
    "name" : "android::trait_pointer<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_pointer<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::OMXPluginBase *>",
    "name" : "android::trait_pointer<android::OMXPluginBase *>",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::String8>",
    "name" : "android::trait_pointer<android::String8>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_pointer<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_pointer<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48607,283 +48512,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_copy<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_copy<OMX_INDEXTYPE>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_copy<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_copy<android::OMXPluginBase *>",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::String8>",
    "name" : "android::trait_trivial_copy<android::String8>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_copy<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_copy<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -48893,8 +48798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -48904,327 +48809,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1686",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_ctor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_ctor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_ctor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_ctor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::String8>",
    "name" : "android::trait_trivial_ctor<android::String8>",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1345",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1142",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1334",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_ctor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_ctor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49234,8 +49139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49245,327 +49150,327 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1680",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_dtor<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_dtor<OMX_INDEXTYPE>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_dtor<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_dtor<android::OMXPluginBase *>",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::String8>",
    "name" : "android::trait_trivial_dtor<android::String8>",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_dtor<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_dtor<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1146",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-1735",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "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-1691",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49575,8 +49480,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49586,338 +49491,338 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1683",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "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-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::trait_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
    "name" : "android::trait_trivial_move<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::trait_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance *>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::trait_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::OMXPluginBase *>",
    "name" : "android::trait_trivial_move<android::OMXPluginBase *>",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-254" ],
    "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-1876",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1161",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
    "name" : "android::trait_trivial_move<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::trait_trivial_move<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-119" ],
+   "template_args" : [ "type-86" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-69" ],
+   "template_args" : [ "type-76" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1636",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-60" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1676" ],
+   "template_args" : [ "type-1650" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1580" ],
+   "template_args" : [ "type-1558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -49927,8 +49832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -49938,250 +49843,250 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-430" ],
+   "template_args" : [ "type-409" ],
    "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-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1661",
+   "self_type" : "type-1661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1681" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-112" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-126" ],
+   "template_args" : [ "type-97" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::traits<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android6traitsIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_COMPONENTTYPE *>",
    "name" : "android::traits<OMX_COMPONENTTYPE *>",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-843" ],
    "unique_id" : "_ZTSN7android6traitsIP17OMX_COMPONENTTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<OMX_INDEXTYPE>",
    "name" : "android::traits<OMX_INDEXTYPE>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android6traitsI13OMX_INDEXTYPEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance *>",
    "name" : "android::traits<android::OMXNodeInstance *>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-824" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_15OMXNodeInstanceEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::traits<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android6traitsINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::OMXPluginBase *>",
    "name" : "android::traits<android::OMXPluginBase *>",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-851" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android6traitsIPNS_13OMXPluginBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::String8>",
    "name" : "android::traits<android::String8>",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android6traitsINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::traits<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1171",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::traits<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::traits<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<long long, long long> >",
    "name" : "android::traits<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIxxEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::sp<android::OMXNodeInstance> >",
    "name" : "android::traits<android::sp<android::OMXNodeInstance> >",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1170",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-823" ],
    "unique_id" : "_ZTSN7android6traitsINS_2spINS_15OMXNodeInstanceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::traits<android::wp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1169",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1162" ],
+   "template_args" : [ "type-1136" ],
    "unique_id" : "_ZTSN7android6traitsINS_2wpINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -50192,16 +50097,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
    "name" : "android::use_trivial_move<OMX_BUFFERHEADERTYPE *>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIP20OMX_BUFFERHEADERTYPEEE"
   },
   {
@@ -50209,16 +50114,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<OMX_INDEXTYPE>",
    "name" : "android::use_trivial_move<OMX_INDEXTYPE>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-134" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveI13OMX_INDEXTYPEEE"
   },
   {
@@ -50226,16 +50131,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
    "name" : "android::use_trivial_move<android::OMXNodeInstance::ActiveBuffer>",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-136" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_15OMXNodeInstance12ActiveBufferEEE"
   },
   {
@@ -50243,16 +50148,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::String8>",
    "name" : "android::use_trivial_move<android::String8>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-365" ],
+   "template_args" : [ "type-346" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_7String8EEE"
   },
   {
@@ -50260,16 +50165,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_BUFFERHEADERTYPE *, unsigned int> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP20OMX_BUFFERHEADERTYPEjEEEE"
   },
   {
@@ -50277,16 +50182,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-1748"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<OMX_COMPONENTTYPE *, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-858" ],
+   "template_args" : [ "type-842" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIP17OMX_COMPONENTTYPEPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50294,16 +50199,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1198"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase> > >",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1169" ],
+   "template_args" : [ "type-1143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEEEE"
   },
   {
@@ -50311,16 +50216,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1769"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::String8, android::OMXPluginBase *> >",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-855" ],
+   "template_args" : [ "type-839" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_7String8EPNS_13OMXPluginBaseEEEEE"
   },
   {
@@ -50328,16 +50233,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1196"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<android::wp<android::hidl::base::V1_0::IBase>, android::sp<android::OMXNodeInstance> > >",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1161" ],
+   "template_args" : [ "type-1135" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_2wpINS_4hidl4base4V1_05IBaseEEENS_2spINS_15OMXNodeInstanceEEEEEEE"
   },
   {
@@ -50345,16 +50250,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<long long, long long> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIxxEEEE"
   },
   {
@@ -50362,16 +50267,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, OMX_BUFFERHEADERTYPE *> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-158" ],
+   "template_args" : [ "type-138" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjP20OMX_BUFFERHEADERTYPEEEEE"
   },
   {
@@ -50379,16 +50284,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-702"
     }
    ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-701",
+   "self_type" : "type-701",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-706" ],
+   "template_args" : [ "type-688" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -50398,23 +50303,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-62"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-100" ],
+   "template_args" : [ "type-66" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -50424,23 +50329,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -50450,23 +50355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-309" ],
+   "template_args" : [ "type-290" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -50476,23 +50381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-279" ],
+   "template_args" : [ "type-260" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -50502,23 +50407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-235"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-255" ],
+   "template_args" : [ "type-236" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -50528,23 +50433,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1137"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-64"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1165" ],
+   "template_args" : [ "type-1139" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -50553,18 +50458,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2017",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -50580,18 +50485,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1996"
+     "referenced_type" : "type-1984"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -50602,7 +50507,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-1954"
     },
     {
      "field_name" : "num_planes",
@@ -50612,13 +50517,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1981"
+     "referenced_type" : "type-1964"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -50629,48 +50534,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1970"
+     "referenced_type" : "type-1942"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -50681,38 +50586,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-2016"
+     "referenced_type" : "type-2003"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -50723,18 +50628,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -50745,17 +50650,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-96"
     },
     {
      "field_name" : "ystride",
@@ -50775,13 +50680,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-478"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -50791,13 +50696,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-109"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -50808,35 +50713,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-114"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-115"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-116"
     }
    ],
    "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-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "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)"
@@ -50857,8 +50762,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -50869,43 +50774,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -50916,32 +50821,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "euid",
@@ -50951,13 +50856,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -50968,32 +50873,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "lid",
@@ -51003,13 +50908,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -51020,17 +50925,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "tid",
@@ -51060,13 +50965,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-113"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -51077,28 +50982,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -51110,8 +51015,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-370",
-   "self_type" : "type-378",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -51119,8 +51024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
@@ -51128,8 +51033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ABuffer> &&",
    "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-89",
-   "self_type" : "type-133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51137,8 +51042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51146,8 +51051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
-   "referenced_type" : "type-658",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-640",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51155,8 +51060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
-   "referenced_type" : "type-537",
-   "self_type" : "type-561",
+   "referenced_type" : "type-524",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -51164,8 +51069,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-503",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-484",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_softomx.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_softomx.so.lsdump
deleted file mode 100644
index 879ce36..0000000
--- a/Q/64/x86_x86_64/source-based/libstagefright_softomx.so.lsdump
+++ /dev/null
@@ -1,28465 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-457",
-   "self_type" : "type-459",
-   "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-447",
-   "self_type" : "type-448",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE [1]",
-   "referenced_type" : "type-389",
-   "self_type" : "type-392",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage::Item [64]",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 1792,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
-   "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
-   "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-79",
-   "self_type" : "type-318",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-106",
-   "self_type" : "type-759",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-194",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3]",
-   "name" : "int [3]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-536",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [3][3]",
-   "name" : "int [3][3]",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [4]",
-   "name" : "int [4]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-537",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [128]",
-   "name" : "unsigned char [128]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-20",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-634",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [1]",
-   "name" : "unsigned char [1]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [256]",
-   "name" : "unsigned char [256]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-635",
-   "size" : 256,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-316",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [64]",
-   "name" : "unsigned char [64]",
-   "referenced_type" : "type-5",
-   "self_type" : "type-631",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [3]",
-   "name" : "unsigned int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-170",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-186",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC1Ev"
-  },
-  {
-   "name" : "_ZN7android13SoftOMXPluginC2Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setLibHandleEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD0Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD1Ev"
-  },
-  {
-   "name" : "_ZN7android16SoftOMXComponentD2Ev"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "name" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent4nameEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-  },
-  {
-   "name" : "_ZNK7android16SoftOMXComponent9libHandleEv"
-  },
-  {
-   "name" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv"
-  },
-  {
-   "name" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "name" : "_ZTVN7android13SoftOMXPluginE"
-  },
-  {
-   "name" : "_ZTVN7android16SoftOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "name" : "_ZTVN7android22SimpleSoftOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoDecoderOMXComponentE"
-  },
-  {
-   "name" : "_ZTVN7android28SoftVideoEncoderOMXComponentE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListINS_2spINS_7ABufferEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8AHandlerE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AndroidVendorValueInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AndroidVendorValueInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AndroidVendorValueString"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AndroidVendorValueEndUnused"
-    }
-   ],
-   "linker_set_key" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "name" : "OMX_ANDROID_VENDOR_VALUETYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ANDROID_VENDOR_VALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACObjectNull"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACObjectMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACObjectLC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACObjectSSR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACObjectLTP"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACObjectHE"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACObjectScalable"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AACObjectERLC"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_AACObjectER_Scalable"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_AACObjectLD"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_AUDIO_AACObjectHE_PS"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_AUDIO_AACObjectELD"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_AUDIO_AACObjectXHE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACObjectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACObjectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACObjectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AACStreamFormatMP2ADTS"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4ADTS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LOAS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4LATM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AACStreamFormatADIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AACStreamFormatMP4FF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AACStreamFormatRAW"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AACStreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AACStreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AACStreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRBandModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRBandModeNB0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRBandModeNB1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRBandModeNB2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRBandModeNB3"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRBandModeNB4"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_AMRBandModeNB5"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_AMRBandModeNB6"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_AMRBandModeNB7"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_AMRBandModeWB0"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_AMRBandModeWB1"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_AMRBandModeWB2"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_AMRBandModeWB3"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_AMRBandModeWB4"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_AMRBandModeWB5"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_AMRBandModeWB6"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_AMRBandModeWB7"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_AMRBandModeWB8"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRBandModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRBandModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRBandModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRDTXModeOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRDTXModeOnVAD2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRDTXModeOnAuto"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRDTXasEFR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRDTXModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRDTXModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRDTXModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_AMRFrameFormatConformance"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_AMRFrameFormatIF2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_AMRFrameFormatFSF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_AMRFrameFormatRTPPayload"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_AMRFrameFormatITU"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_AMRFrameFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_AMRFrameFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_AMRFrameFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CDMARateBlank"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CDMARateFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CDMARateHalf"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CDMARateQuarter"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CDMARateEighth"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CDMARateErasure"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CDMARateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CDMARateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CDMARateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
-   "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CDMARATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelModeStereo"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelModeJointStereo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelModeDual"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelModeMono"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
-   "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_ChannelNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_ChannelLF"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_ChannelRF"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_ChannelCF"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_ChannelLS"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_ChannelRS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_ChannelLFE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_ChannelCS"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_ChannelLR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_ChannelRR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_ChannelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_ChannelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_ChannelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
-   "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CHANNELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_CodingPCM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_CodingADPCM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_CodingAMR"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_CodingGSMFR"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_CodingGSMEFR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_CodingGSMHR"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_AUDIO_CodingPDCFR"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_AUDIO_CodingPDCEFR"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_AUDIO_CodingPDCHR"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_AUDIO_CodingTDMAFR"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_AUDIO_CodingTDMAEFR"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_AUDIO_CodingQCELP8"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_AUDIO_CodingQCELP13"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_AUDIO_CodingEVRC"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_AUDIO_CodingSMV"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_AUDIO_CodingG711"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_AUDIO_CodingG723"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_AUDIO_CodingG726"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_AUDIO_CodingG729"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_AUDIO_CodingAAC"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_AUDIO_CodingMP3"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_AUDIO_CodingSBC"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_AUDIO_CodingVORBIS"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_AUDIO_CodingWMA"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_AUDIO_CodingRA"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_AUDIO_CodingMIDI"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_AUDIO_CodingFLAC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
-   "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_EchoCanOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_EchoCanNormal"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_EchoCanHFree"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_EchoCanCarKit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_EchoCanKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_EchoCanVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_EchoCanMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
-   "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G723ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G723ModeLow"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G723ModeHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G723ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G723ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G723ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G723RATE",
-   "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G723RATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G726ModeUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G726Mode16"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G726Mode24"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G726Mode32"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_G726Mode40"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G726ModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G726ModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G726ModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G726MODE",
-   "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G726MODE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_G729"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_G729A"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_G729B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_G729AB"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_G729KhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_G729VendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_G729Max"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_G729TYPE",
-   "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIFormatUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIFormatSMF0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIFormatSMF1"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIFormatSMF2"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIFormatSPMIDI"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIFormatXMF0"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIFormatXMF1"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_MIDIFormatMobileXMF"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateClosedEngaged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateParsing"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateOpenEngaged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlaying"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingPartially"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_MIDIPlayBackStatePlayingSilently"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDIPlayBackStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutGM2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutUser"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankLayoutMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MIDISoundBankUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MIDISoundBankDLS2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSBase"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MIDISoundBankKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MIDISoundBankVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MIDISoundBankMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP1Layer3"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2Layer3"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_MP3StreamFormatMP2_5Layer3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_MP3StreamFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_MP3StreamFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_MP3StreamFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_PCMModeLinear"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_PCMModeALaw"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_PCMModeMULaw"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_PCMModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_PCMModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_PCMModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_RAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_RA8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_RA9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_RA10_AAC"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_AUDIO_RA10_CODEC"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_AUDIO_RA10_LOSSLESS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_AUDIO_RA10_MULTICHANNEL"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_AUDIO_RA10_VOICE"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_RAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_RAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
-   "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_SBCAllocMethodLoudness"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_SBCAllocMethodSNR"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_SBCAllocMethodKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_SBCAllocMethodVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_SBCAllocMethodMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_StereoWideningHeadphones"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_StereoWideningLoudspeakers"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_StereoWideningKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_StereoWideningVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_StereoWideningMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAFormat7"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAFormat8"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
-   "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_AUDIO_WMAProfileUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_AUDIO_WMAProfileL1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_AUDIO_WMAProfileL2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_AUDIO_WMAProfileL3"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_AUDIO_WMAProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_AUDIO_WMAProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_AUDIO_WMAProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
-   "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BOOL_MAX"
-    }
-   ],
-   "linker_set_key" : "OMX_BOOL",
-   "name" : "OMX_BOOL",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BOOL"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_BufferSupplyUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_BufferSupplyInput"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_BufferSupplyOutput"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_BufferSupplyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_BufferSupplyVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_BufferSupplyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ColorBlendNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ColorBlendAlphaConstant"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ColorBlendAlphaPerPixel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ColorBlendAlternate"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ColorBlendAnd"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ColorBlendOr"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ColorBlendInvert"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ColorBlendKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ColorBlendVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ColorBlendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLORBLENDTYPE",
-   "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_COLOR_FormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_COLOR_FormatMonochrome"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_COLOR_Format8bitRGB332"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_COLOR_Format12bitRGB444"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_COLOR_Format16bitARGB4444"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_COLOR_Format16bitARGB1555"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_COLOR_Format16bitRGB565"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_COLOR_Format16bitBGR565"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_COLOR_Format18bitRGB666"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_COLOR_Format18bitARGB1665"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_COLOR_Format19bitARGB1666"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_COLOR_Format24bitRGB888"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_COLOR_Format24bitBGR888"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_COLOR_Format24bitARGB1887"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_COLOR_Format25bitARGB1888"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_COLOR_Format32bitBGRA8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_COLOR_Format32bitARGB8888"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_COLOR_FormatYUV411Planar"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_COLOR_FormatYUV411PackedPlanar"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_COLOR_FormatYUV420Planar"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_COLOR_FormatYUV420PackedPlanar"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_COLOR_FormatYUV420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_COLOR_FormatYUV422Planar"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_COLOR_FormatYUV422PackedPlanar"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_COLOR_FormatYUV422SemiPlanar"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_COLOR_FormatYCbYCr"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_COLOR_FormatYCrYCb"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_COLOR_FormatCbYCrY"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_COLOR_FormatCrYCbY"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_COLOR_FormatYUV444Interleaved"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_COLOR_FormatRawBayer8bit"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_COLOR_FormatRawBayer10bit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_COLOR_FormatRawBayer8bitcompressed"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_COLOR_FormatL2"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "OMX_COLOR_FormatL4"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "OMX_COLOR_FormatL8"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "OMX_COLOR_FormatL16"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "OMX_COLOR_FormatL24"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "OMX_COLOR_FormatL32"
-    },
-    {
-     "enum_field_value" : 39,
-     "name" : "OMX_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "OMX_COLOR_FormatYUV422PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "OMX_COLOR_Format18BitBGR666"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "OMX_COLOR_Format24BitARGB6666"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "OMX_COLOR_Format24BitABGR6666"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_COLOR_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_COLOR_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130708361,
-     "name" : "OMX_COLOR_FormatAndroidOpaque"
-    },
-    {
-     "enum_field_value" : 2130747392,
-     "name" : "OMX_COLOR_Format32BitRGBA8888"
-    },
-    {
-     "enum_field_value" : 2135033992,
-     "name" : "OMX_COLOR_FormatYUV420Flexible"
-    },
-    {
-     "enum_field_value" : 2135032171,
-     "name" : "OMX_COLOR_FormatYUV420Planar16"
-    },
-    {
-     "enum_field_value" : 2135181994,
-     "name" : "OMX_COLOR_FormatYUV444Y410"
-    },
-    {
-     "enum_field_value" : 2130706688,
-     "name" : "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391872,
-     "name" : "OMX_QCOM_COLOR_FormatYVU420SemiPlanar"
-    },
-    {
-     "enum_field_value" : 2141391875,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka"
-    },
-    {
-     "enum_field_value" : 2143289346,
-     "name" : "OMX_SEC_COLOR_FormatNV12Tiled"
-    },
-    {
-     "enum_field_value" : 2141391876,
-     "name" : "OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_COLOR_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COLOR_FORMATTYPE",
-   "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COLOR_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_CommandStateSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_CommandFlush"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_CommandPortDisable"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_CommandPortEnable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_CommandMarkBuffer"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_CommandKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_CommandVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_CommandMax"
-    }
-   ],
-   "linker_set_key" : "OMX_COMMANDTYPE",
-   "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_COMMANDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataEncapsulationElementaryStream"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataEncapsulationGenericPayload"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataEncapsulationRtpPayload"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataEncapsulationKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataEncapsulationVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataEncapsulationMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DataUnitCodedPicture"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DataUnitVideoSegment"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DataUnitSeveralSegments"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DataUnitArbitraryStreamSection"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DataUnitKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DataUnitVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DataUnitMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DATAUNITTYPE",
-   "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DirInput"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DirOutput"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DirMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DIRTYPE",
-   "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DIRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_DitherNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_DitherOrdered"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_DitherErrorDiffusion"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_DitherOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_DitherKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_DitherVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_DitherMax"
-    }
-   ],
-   "linker_set_key" : "OMX_DITHERTYPE",
-   "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EndianBig"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EndianLittle"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EndianMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ENDIANTYPE",
-   "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_ENDIANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ErrorNone"
-    },
-    {
-     "enum_field_value" : -2147479552,
-     "name" : "OMX_ErrorInsufficientResources"
-    },
-    {
-     "enum_field_value" : -2147479551,
-     "name" : "OMX_ErrorUndefined"
-    },
-    {
-     "enum_field_value" : -2147479550,
-     "name" : "OMX_ErrorInvalidComponentName"
-    },
-    {
-     "enum_field_value" : -2147479549,
-     "name" : "OMX_ErrorComponentNotFound"
-    },
-    {
-     "enum_field_value" : -2147479548,
-     "name" : "OMX_ErrorInvalidComponent"
-    },
-    {
-     "enum_field_value" : -2147479547,
-     "name" : "OMX_ErrorBadParameter"
-    },
-    {
-     "enum_field_value" : -2147479546,
-     "name" : "OMX_ErrorNotImplemented"
-    },
-    {
-     "enum_field_value" : -2147479545,
-     "name" : "OMX_ErrorUnderflow"
-    },
-    {
-     "enum_field_value" : -2147479544,
-     "name" : "OMX_ErrorOverflow"
-    },
-    {
-     "enum_field_value" : -2147479543,
-     "name" : "OMX_ErrorHardware"
-    },
-    {
-     "enum_field_value" : -2147479542,
-     "name" : "OMX_ErrorInvalidState"
-    },
-    {
-     "enum_field_value" : -2147479541,
-     "name" : "OMX_ErrorStreamCorrupt"
-    },
-    {
-     "enum_field_value" : -2147479540,
-     "name" : "OMX_ErrorPortsNotCompatible"
-    },
-    {
-     "enum_field_value" : -2147479539,
-     "name" : "OMX_ErrorResourcesLost"
-    },
-    {
-     "enum_field_value" : -2147479538,
-     "name" : "OMX_ErrorNoMore"
-    },
-    {
-     "enum_field_value" : -2147479537,
-     "name" : "OMX_ErrorVersionMismatch"
-    },
-    {
-     "enum_field_value" : -2147479536,
-     "name" : "OMX_ErrorNotReady"
-    },
-    {
-     "enum_field_value" : -2147479535,
-     "name" : "OMX_ErrorTimeout"
-    },
-    {
-     "enum_field_value" : -2147479534,
-     "name" : "OMX_ErrorSameState"
-    },
-    {
-     "enum_field_value" : -2147479533,
-     "name" : "OMX_ErrorResourcesPreempted"
-    },
-    {
-     "enum_field_value" : -2147479532,
-     "name" : "OMX_ErrorPortUnresponsiveDuringAllocation"
-    },
-    {
-     "enum_field_value" : -2147479531,
-     "name" : "OMX_ErrorPortUnresponsiveDuringDeallocation"
-    },
-    {
-     "enum_field_value" : -2147479530,
-     "name" : "OMX_ErrorPortUnresponsiveDuringStop"
-    },
-    {
-     "enum_field_value" : -2147479529,
-     "name" : "OMX_ErrorIncorrectStateTransition"
-    },
-    {
-     "enum_field_value" : -2147479528,
-     "name" : "OMX_ErrorIncorrectStateOperation"
-    },
-    {
-     "enum_field_value" : -2147479527,
-     "name" : "OMX_ErrorUnsupportedSetting"
-    },
-    {
-     "enum_field_value" : -2147479526,
-     "name" : "OMX_ErrorUnsupportedIndex"
-    },
-    {
-     "enum_field_value" : -2147479525,
-     "name" : "OMX_ErrorBadPortIndex"
-    },
-    {
-     "enum_field_value" : -2147479524,
-     "name" : "OMX_ErrorPortUnpopulated"
-    },
-    {
-     "enum_field_value" : -2147479523,
-     "name" : "OMX_ErrorComponentSuspended"
-    },
-    {
-     "enum_field_value" : -2147479522,
-     "name" : "OMX_ErrorDynamicResourcesUnavailable"
-    },
-    {
-     "enum_field_value" : -2147479521,
-     "name" : "OMX_ErrorMbErrorsInFrame"
-    },
-    {
-     "enum_field_value" : -2147479520,
-     "name" : "OMX_ErrorFormatNotDetected"
-    },
-    {
-     "enum_field_value" : -2147479519,
-     "name" : "OMX_ErrorContentPipeOpenFailed"
-    },
-    {
-     "enum_field_value" : -2147479518,
-     "name" : "OMX_ErrorContentPipeCreationFailed"
-    },
-    {
-     "enum_field_value" : -2147479517,
-     "name" : "OMX_ErrorSeperateTablesUsed"
-    },
-    {
-     "enum_field_value" : -2147479516,
-     "name" : "OMX_ErrorTunnelingUnsupported"
-    },
-    {
-     "enum_field_value" : -1895825408,
-     "name" : "OMX_ErrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : -1879048192,
-     "name" : "OMX_ErrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ErrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_ERRORTYPE",
-   "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "OMX_ERRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EventCmdComplete"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EventError"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EventMark"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EventPortSettingsChanged"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EventBufferFlag"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EventResourcesAcquired"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EventComponentResumed"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_EventDynamicResourcesAvailable"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_EventPortFormatDetected"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EventKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EventVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_EventOutputRendered"
-    },
-    {
-     "enum_field_value" : 2130706434,
-     "name" : "OMX_EventDataSpaceChanged"
-    },
-    {
-     "enum_field_value" : 2130706435,
-     "name" : "OMX_EventConfigUpdate"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EventMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EVENTTYPE",
-   "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExposureControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExposureControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ExposureControlNight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ExposureControlBackLight"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ExposureControlSpotLight"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ExposureControlSports"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ExposureControlSnow"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ExposureControlBeach"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ExposureControlLargeAperture"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ExposureControlSmallApperture"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExposureControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExposureControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExposureControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
-   "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ExtraDataNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ExtraDataQuantization"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ExtraDataKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ExtraDataVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ExtraDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_EXTRADATATYPE",
-   "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_FocusStatusOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_FocusStatusRequest"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_FocusStatusReached"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_FocusStatusUnableToReach"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_FocusStatusLost"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_FocusStatusKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_FocusStatusVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_FocusStatusMax"
-    }
-   ],
-   "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
-   "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_ImageFilterNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_ImageFilterNoise"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_ImageFilterEmboss"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_ImageFilterNegative"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_ImageFilterSketch"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_ImageFilterOilPaint"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_ImageFilterHatch"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_ImageFilterGpen"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_ImageFilterAntialias"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_ImageFilterDeRing"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_ImageFilterSolarize"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_ImageFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_ImageFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_ImageFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGEFILTERTYPE",
-   "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_CodingJPEG"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_CodingJPEG2K"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_CodingEXIF"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_CodingTIFF"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_IMAGE_CodingGIF"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_IMAGE_CodingPNG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_IMAGE_CodingLZW"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_IMAGE_CodingBMP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
-   "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FlashControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FlashControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FlashControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FlashControlRedEyeReduction"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_FlashControlFillin"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_FlashControlTorch"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FlashControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FlashControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FlashControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_FocusControlOn"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_FocusControlOff"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_FocusControlAuto"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_FocusControlAutoLock"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_FocusControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_FocusControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_FocusControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_HuffmanTableAC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_HuffmanTableDC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_HuffmanTableACLuma"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_HuffmanTableACChroma"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_IMAGE_HuffmanTableDCLuma"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_IMAGE_HuffmanTableDCChroma"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_HuffmanTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_HuffmanTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_HuffmanTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_IMAGE_QuantizationTableLuma"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_IMAGE_QuantizationTableChroma"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCb"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_IMAGE_QuantizationTableChromaCr"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IMAGE_QuantizationTableKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IMAGE_QuantizationTableVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IMAGE_QuantizationTableMax"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1863319552,
-     "name" : "OMX_IndexExtComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 1863319553,
-     "name" : "OMX_IndexConfigCallbackRequest"
-    },
-    {
-     "enum_field_value" : 1863319554,
-     "name" : "OMX_IndexConfigCommitMode"
-    },
-    {
-     "enum_field_value" : 1863319555,
-     "name" : "OMX_IndexConfigCommit"
-    },
-    {
-     "enum_field_value" : 1863319556,
-     "name" : "OMX_IndexConfigAndroidVendorExtension"
-    },
-    {
-     "enum_field_value" : 1864368128,
-     "name" : "OMX_IndexExtPortStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465280,
-     "name" : "OMX_IndexExtAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 1866465281,
-     "name" : "OMX_IndexParamAudioAndroidAc3"
-    },
-    {
-     "enum_field_value" : 1866465282,
-     "name" : "OMX_IndexParamAudioAndroidOpus"
-    },
-    {
-     "enum_field_value" : 1866465283,
-     "name" : "OMX_IndexParamAudioAndroidAacPresentation"
-    },
-    {
-     "enum_field_value" : 1866465284,
-     "name" : "OMX_IndexParamAudioAndroidEac3"
-    },
-    {
-     "enum_field_value" : 1866465285,
-     "name" : "OMX_IndexParamAudioProfileQuerySupported"
-    },
-    {
-     "enum_field_value" : 1866465286,
-     "name" : "OMX_IndexParamAudioAndroidAacDrcPresentation"
-    },
-    {
-     "enum_field_value" : 1866465287,
-     "name" : "OMX_IndexParamAudioAndroidAc4"
-    },
-    {
-     "enum_field_value" : 1866465288,
-     "name" : "OMX_IndexConfigAudioPresentation"
-    },
-    {
-     "enum_field_value" : 1866465289,
-     "name" : "OMX_IndexExtAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 1867513856,
-     "name" : "OMX_IndexExtImageStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562432,
-     "name" : "OMX_IndexExtVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 1868562433,
-     "name" : "OMX_IndexParamNalStreamFormatSupported"
-    },
-    {
-     "enum_field_value" : 1868562434,
-     "name" : "OMX_IndexParamNalStreamFormat"
-    },
-    {
-     "enum_field_value" : 1868562435,
-     "name" : "OMX_IndexParamNalStreamFormatSelect"
-    },
-    {
-     "enum_field_value" : 1868562436,
-     "name" : "OMX_IndexParamVideoVp8"
-    },
-    {
-     "enum_field_value" : 1868562437,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrame"
-    },
-    {
-     "enum_field_value" : 1868562438,
-     "name" : "OMX_IndexConfigVideoVp8ReferenceFrameType"
-    },
-    {
-     "enum_field_value" : 1868562439,
-     "name" : "OMX_IndexParamVideoAndroidVp8Encoder"
-    },
-    {
-     "enum_field_value" : 1868562440,
-     "name" : "OMX_IndexParamVideoHevc"
-    },
-    {
-     "enum_field_value" : 1868562441,
-     "name" : "OMX_IndexParamSliceSegments"
-    },
-    {
-     "enum_field_value" : 1868562442,
-     "name" : "OMX_IndexConfigAndroidIntraRefresh"
-    },
-    {
-     "enum_field_value" : 1868562443,
-     "name" : "OMX_IndexParamAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562444,
-     "name" : "OMX_IndexConfigAndroidVideoTemporalLayering"
-    },
-    {
-     "enum_field_value" : 1868562445,
-     "name" : "OMX_IndexParamMaxFrameDurationForBitrateControl"
-    },
-    {
-     "enum_field_value" : 1868562446,
-     "name" : "OMX_IndexParamVideoVp9"
-    },
-    {
-     "enum_field_value" : 1868562447,
-     "name" : "OMX_IndexParamVideoAndroidVp9Encoder"
-    },
-    {
-     "enum_field_value" : 1868562448,
-     "name" : "OMX_IndexParamVideoAndroidImageGrid"
-    },
-    {
-     "enum_field_value" : 1868562449,
-     "name" : "OMX_IndexExtVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 1869611008,
-     "name" : "OMX_IndexExtCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659584,
-     "name" : "OMX_IndexExtOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 1870659585,
-     "name" : "OMX_IndexConfigAutoFramerateConversion"
-    },
-    {
-     "enum_field_value" : 1870659586,
-     "name" : "OMX_IndexConfigPriority"
-    },
-    {
-     "enum_field_value" : 1870659587,
-     "name" : "OMX_IndexConfigOperatingRate"
-    },
-    {
-     "enum_field_value" : 1870659588,
-     "name" : "OMX_IndexParamConsumerUsageBits"
-    },
-    {
-     "enum_field_value" : 1870659589,
-     "name" : "OMX_IndexConfigLatency"
-    },
-    {
-     "enum_field_value" : 1870659590,
-     "name" : "OMX_IndexExtOtherEndUnused"
-    },
-    {
-     "enum_field_value" : 1871708160,
-     "name" : "OMX_IndexExtTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexExtMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXEXTTYPE",
-   "name" : "OMX_INDEXEXTTYPE",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_IndexComponentStartUnused"
-    },
-    {
-     "enum_field_value" : 16777217,
-     "name" : "OMX_IndexParamPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777218,
-     "name" : "OMX_IndexParamAudioInit"
-    },
-    {
-     "enum_field_value" : 16777219,
-     "name" : "OMX_IndexParamImageInit"
-    },
-    {
-     "enum_field_value" : 16777220,
-     "name" : "OMX_IndexParamVideoInit"
-    },
-    {
-     "enum_field_value" : 16777221,
-     "name" : "OMX_IndexParamOtherInit"
-    },
-    {
-     "enum_field_value" : 16777222,
-     "name" : "OMX_IndexParamNumAvailableStreams"
-    },
-    {
-     "enum_field_value" : 16777223,
-     "name" : "OMX_IndexParamActiveStream"
-    },
-    {
-     "enum_field_value" : 16777224,
-     "name" : "OMX_IndexParamSuspensionPolicy"
-    },
-    {
-     "enum_field_value" : 16777225,
-     "name" : "OMX_IndexParamComponentSuspended"
-    },
-    {
-     "enum_field_value" : 16777226,
-     "name" : "OMX_IndexConfigCapturing"
-    },
-    {
-     "enum_field_value" : 16777227,
-     "name" : "OMX_IndexConfigCaptureMode"
-    },
-    {
-     "enum_field_value" : 16777228,
-     "name" : "OMX_IndexAutoPauseAfterCapture"
-    },
-    {
-     "enum_field_value" : 16777229,
-     "name" : "OMX_IndexParamContentURI"
-    },
-    {
-     "enum_field_value" : 16777230,
-     "name" : "OMX_IndexParamCustomContentPipe"
-    },
-    {
-     "enum_field_value" : 16777231,
-     "name" : "OMX_IndexParamDisableResourceConcealment"
-    },
-    {
-     "enum_field_value" : 16777232,
-     "name" : "OMX_IndexConfigMetadataItemCount"
-    },
-    {
-     "enum_field_value" : 16777233,
-     "name" : "OMX_IndexConfigContainerNodeCount"
-    },
-    {
-     "enum_field_value" : 16777234,
-     "name" : "OMX_IndexConfigMetadataItem"
-    },
-    {
-     "enum_field_value" : 16777235,
-     "name" : "OMX_IndexConfigCounterNodeID"
-    },
-    {
-     "enum_field_value" : 16777236,
-     "name" : "OMX_IndexParamMetadataFilterType"
-    },
-    {
-     "enum_field_value" : 16777237,
-     "name" : "OMX_IndexParamMetadataKeyFilter"
-    },
-    {
-     "enum_field_value" : 16777238,
-     "name" : "OMX_IndexConfigPriorityMgmt"
-    },
-    {
-     "enum_field_value" : 16777239,
-     "name" : "OMX_IndexParamStandardComponentRole"
-    },
-    {
-     "enum_field_value" : 16777240,
-     "name" : "OMX_IndexComponentEndUnused"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_IndexPortStartUnused"
-    },
-    {
-     "enum_field_value" : 33554433,
-     "name" : "OMX_IndexParamPortDefinition"
-    },
-    {
-     "enum_field_value" : 33554434,
-     "name" : "OMX_IndexParamCompBufferSupplier"
-    },
-    {
-     "enum_field_value" : 33554435,
-     "name" : "OMX_IndexPortEndUnused"
-    },
-    {
-     "enum_field_value" : 50331648,
-     "name" : "OMX_IndexReservedStartUnused"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "OMX_IndexAudioStartUnused"
-    },
-    {
-     "enum_field_value" : 67108865,
-     "name" : "OMX_IndexParamAudioPortFormat"
-    },
-    {
-     "enum_field_value" : 67108866,
-     "name" : "OMX_IndexParamAudioPcm"
-    },
-    {
-     "enum_field_value" : 67108867,
-     "name" : "OMX_IndexParamAudioAac"
-    },
-    {
-     "enum_field_value" : 67108868,
-     "name" : "OMX_IndexParamAudioRa"
-    },
-    {
-     "enum_field_value" : 67108869,
-     "name" : "OMX_IndexParamAudioMp3"
-    },
-    {
-     "enum_field_value" : 67108870,
-     "name" : "OMX_IndexParamAudioAdpcm"
-    },
-    {
-     "enum_field_value" : 67108871,
-     "name" : "OMX_IndexParamAudioG723"
-    },
-    {
-     "enum_field_value" : 67108872,
-     "name" : "OMX_IndexParamAudioG729"
-    },
-    {
-     "enum_field_value" : 67108873,
-     "name" : "OMX_IndexParamAudioAmr"
-    },
-    {
-     "enum_field_value" : 67108874,
-     "name" : "OMX_IndexParamAudioWma"
-    },
-    {
-     "enum_field_value" : 67108875,
-     "name" : "OMX_IndexParamAudioSbc"
-    },
-    {
-     "enum_field_value" : 67108876,
-     "name" : "OMX_IndexParamAudioMidi"
-    },
-    {
-     "enum_field_value" : 67108877,
-     "name" : "OMX_IndexParamAudioGsm_FR"
-    },
-    {
-     "enum_field_value" : 67108878,
-     "name" : "OMX_IndexParamAudioMidiLoadUserSound"
-    },
-    {
-     "enum_field_value" : 67108879,
-     "name" : "OMX_IndexParamAudioG726"
-    },
-    {
-     "enum_field_value" : 67108880,
-     "name" : "OMX_IndexParamAudioGsm_EFR"
-    },
-    {
-     "enum_field_value" : 67108881,
-     "name" : "OMX_IndexParamAudioGsm_HR"
-    },
-    {
-     "enum_field_value" : 67108882,
-     "name" : "OMX_IndexParamAudioPdc_FR"
-    },
-    {
-     "enum_field_value" : 67108883,
-     "name" : "OMX_IndexParamAudioPdc_EFR"
-    },
-    {
-     "enum_field_value" : 67108884,
-     "name" : "OMX_IndexParamAudioPdc_HR"
-    },
-    {
-     "enum_field_value" : 67108885,
-     "name" : "OMX_IndexParamAudioTdma_FR"
-    },
-    {
-     "enum_field_value" : 67108886,
-     "name" : "OMX_IndexParamAudioTdma_EFR"
-    },
-    {
-     "enum_field_value" : 67108887,
-     "name" : "OMX_IndexParamAudioQcelp8"
-    },
-    {
-     "enum_field_value" : 67108888,
-     "name" : "OMX_IndexParamAudioQcelp13"
-    },
-    {
-     "enum_field_value" : 67108889,
-     "name" : "OMX_IndexParamAudioEvrc"
-    },
-    {
-     "enum_field_value" : 67108890,
-     "name" : "OMX_IndexParamAudioSmv"
-    },
-    {
-     "enum_field_value" : 67108891,
-     "name" : "OMX_IndexParamAudioVorbis"
-    },
-    {
-     "enum_field_value" : 67108892,
-     "name" : "OMX_IndexParamAudioFlac"
-    },
-    {
-     "enum_field_value" : 67108893,
-     "name" : "OMX_IndexAudioEndUnused"
-    },
-    {
-     "enum_field_value" : 67108894,
-     "name" : "OMX_IndexConfigAudioMidiImmediateEvent"
-    },
-    {
-     "enum_field_value" : 67108895,
-     "name" : "OMX_IndexConfigAudioMidiControl"
-    },
-    {
-     "enum_field_value" : 67108896,
-     "name" : "OMX_IndexConfigAudioMidiSoundBankProgram"
-    },
-    {
-     "enum_field_value" : 67108897,
-     "name" : "OMX_IndexConfigAudioMidiStatus"
-    },
-    {
-     "enum_field_value" : 67108898,
-     "name" : "OMX_IndexConfigAudioMidiMetaEvent"
-    },
-    {
-     "enum_field_value" : 67108899,
-     "name" : "OMX_IndexConfigAudioMidiMetaEventData"
-    },
-    {
-     "enum_field_value" : 67108900,
-     "name" : "OMX_IndexConfigAudioVolume"
-    },
-    {
-     "enum_field_value" : 67108901,
-     "name" : "OMX_IndexConfigAudioBalance"
-    },
-    {
-     "enum_field_value" : 67108902,
-     "name" : "OMX_IndexConfigAudioChannelMute"
-    },
-    {
-     "enum_field_value" : 67108903,
-     "name" : "OMX_IndexConfigAudioMute"
-    },
-    {
-     "enum_field_value" : 67108904,
-     "name" : "OMX_IndexConfigAudioLoudness"
-    },
-    {
-     "enum_field_value" : 67108905,
-     "name" : "OMX_IndexConfigAudioEchoCancelation"
-    },
-    {
-     "enum_field_value" : 67108906,
-     "name" : "OMX_IndexConfigAudioNoiseReduction"
-    },
-    {
-     "enum_field_value" : 67108907,
-     "name" : "OMX_IndexConfigAudioBass"
-    },
-    {
-     "enum_field_value" : 67108908,
-     "name" : "OMX_IndexConfigAudioTreble"
-    },
-    {
-     "enum_field_value" : 67108909,
-     "name" : "OMX_IndexConfigAudioStereoWidening"
-    },
-    {
-     "enum_field_value" : 67108910,
-     "name" : "OMX_IndexConfigAudioChorus"
-    },
-    {
-     "enum_field_value" : 67108911,
-     "name" : "OMX_IndexConfigAudioEqualizer"
-    },
-    {
-     "enum_field_value" : 67108912,
-     "name" : "OMX_IndexConfigAudioReverberation"
-    },
-    {
-     "enum_field_value" : 67108913,
-     "name" : "OMX_IndexConfigAudioChannelVolume"
-    },
-    {
-     "enum_field_value" : 83886080,
-     "name" : "OMX_IndexImageStartUnused"
-    },
-    {
-     "enum_field_value" : 83886081,
-     "name" : "OMX_IndexParamImagePortFormat"
-    },
-    {
-     "enum_field_value" : 83886082,
-     "name" : "OMX_IndexParamFlashControl"
-    },
-    {
-     "enum_field_value" : 83886083,
-     "name" : "OMX_IndexConfigFocusControl"
-    },
-    {
-     "enum_field_value" : 83886084,
-     "name" : "OMX_IndexParamQFactor"
-    },
-    {
-     "enum_field_value" : 83886085,
-     "name" : "OMX_IndexParamQuantizationTable"
-    },
-    {
-     "enum_field_value" : 83886086,
-     "name" : "OMX_IndexParamHuffmanTable"
-    },
-    {
-     "enum_field_value" : 83886087,
-     "name" : "OMX_IndexConfigFlashControl"
-    },
-    {
-     "enum_field_value" : 100663296,
-     "name" : "OMX_IndexVideoStartUnused"
-    },
-    {
-     "enum_field_value" : 100663297,
-     "name" : "OMX_IndexParamVideoPortFormat"
-    },
-    {
-     "enum_field_value" : 100663298,
-     "name" : "OMX_IndexParamVideoQuantization"
-    },
-    {
-     "enum_field_value" : 100663299,
-     "name" : "OMX_IndexParamVideoFastUpdate"
-    },
-    {
-     "enum_field_value" : 100663300,
-     "name" : "OMX_IndexParamVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663301,
-     "name" : "OMX_IndexParamVideoMotionVector"
-    },
-    {
-     "enum_field_value" : 100663302,
-     "name" : "OMX_IndexParamVideoIntraRefresh"
-    },
-    {
-     "enum_field_value" : 100663303,
-     "name" : "OMX_IndexParamVideoErrorCorrection"
-    },
-    {
-     "enum_field_value" : 100663304,
-     "name" : "OMX_IndexParamVideoVBSMC"
-    },
-    {
-     "enum_field_value" : 100663305,
-     "name" : "OMX_IndexParamVideoMpeg2"
-    },
-    {
-     "enum_field_value" : 100663306,
-     "name" : "OMX_IndexParamVideoMpeg4"
-    },
-    {
-     "enum_field_value" : 100663307,
-     "name" : "OMX_IndexParamVideoWmv"
-    },
-    {
-     "enum_field_value" : 100663308,
-     "name" : "OMX_IndexParamVideoRv"
-    },
-    {
-     "enum_field_value" : 100663309,
-     "name" : "OMX_IndexParamVideoAvc"
-    },
-    {
-     "enum_field_value" : 100663310,
-     "name" : "OMX_IndexParamVideoH263"
-    },
-    {
-     "enum_field_value" : 100663311,
-     "name" : "OMX_IndexParamVideoProfileLevelQuerySupported"
-    },
-    {
-     "enum_field_value" : 100663312,
-     "name" : "OMX_IndexParamVideoProfileLevelCurrent"
-    },
-    {
-     "enum_field_value" : 100663313,
-     "name" : "OMX_IndexConfigVideoBitrate"
-    },
-    {
-     "enum_field_value" : 100663314,
-     "name" : "OMX_IndexConfigVideoFramerate"
-    },
-    {
-     "enum_field_value" : 100663315,
-     "name" : "OMX_IndexConfigVideoIntraVOPRefresh"
-    },
-    {
-     "enum_field_value" : 100663316,
-     "name" : "OMX_IndexConfigVideoIntraMBRefresh"
-    },
-    {
-     "enum_field_value" : 100663317,
-     "name" : "OMX_IndexConfigVideoMBErrorReporting"
-    },
-    {
-     "enum_field_value" : 100663318,
-     "name" : "OMX_IndexParamVideoMacroblocksPerFrame"
-    },
-    {
-     "enum_field_value" : 100663319,
-     "name" : "OMX_IndexConfigVideoMacroBlockErrorMap"
-    },
-    {
-     "enum_field_value" : 100663320,
-     "name" : "OMX_IndexParamVideoSliceFMO"
-    },
-    {
-     "enum_field_value" : 100663321,
-     "name" : "OMX_IndexConfigVideoAVCIntraPeriod"
-    },
-    {
-     "enum_field_value" : 100663322,
-     "name" : "OMX_IndexConfigVideoNalSize"
-    },
-    {
-     "enum_field_value" : 100663323,
-     "name" : "OMX_IndexVideoEndUnused"
-    },
-    {
-     "enum_field_value" : 117440512,
-     "name" : "OMX_IndexCommonStartUnused"
-    },
-    {
-     "enum_field_value" : 117440513,
-     "name" : "OMX_IndexParamCommonDeblocking"
-    },
-    {
-     "enum_field_value" : 117440514,
-     "name" : "OMX_IndexParamCommonSensorMode"
-    },
-    {
-     "enum_field_value" : 117440515,
-     "name" : "OMX_IndexParamCommonInterleave"
-    },
-    {
-     "enum_field_value" : 117440516,
-     "name" : "OMX_IndexConfigCommonColorFormatConversion"
-    },
-    {
-     "enum_field_value" : 117440517,
-     "name" : "OMX_IndexConfigCommonScale"
-    },
-    {
-     "enum_field_value" : 117440518,
-     "name" : "OMX_IndexConfigCommonImageFilter"
-    },
-    {
-     "enum_field_value" : 117440519,
-     "name" : "OMX_IndexConfigCommonColorEnhancement"
-    },
-    {
-     "enum_field_value" : 117440520,
-     "name" : "OMX_IndexConfigCommonColorKey"
-    },
-    {
-     "enum_field_value" : 117440521,
-     "name" : "OMX_IndexConfigCommonColorBlend"
-    },
-    {
-     "enum_field_value" : 117440522,
-     "name" : "OMX_IndexConfigCommonFrameStabilisation"
-    },
-    {
-     "enum_field_value" : 117440523,
-     "name" : "OMX_IndexConfigCommonRotate"
-    },
-    {
-     "enum_field_value" : 117440524,
-     "name" : "OMX_IndexConfigCommonMirror"
-    },
-    {
-     "enum_field_value" : 117440525,
-     "name" : "OMX_IndexConfigCommonOutputPosition"
-    },
-    {
-     "enum_field_value" : 117440526,
-     "name" : "OMX_IndexConfigCommonInputCrop"
-    },
-    {
-     "enum_field_value" : 117440527,
-     "name" : "OMX_IndexConfigCommonOutputCrop"
-    },
-    {
-     "enum_field_value" : 117440528,
-     "name" : "OMX_IndexConfigCommonDigitalZoom"
-    },
-    {
-     "enum_field_value" : 117440529,
-     "name" : "OMX_IndexConfigCommonOpticalZoom"
-    },
-    {
-     "enum_field_value" : 117440530,
-     "name" : "OMX_IndexConfigCommonWhiteBalance"
-    },
-    {
-     "enum_field_value" : 117440531,
-     "name" : "OMX_IndexConfigCommonExposure"
-    },
-    {
-     "enum_field_value" : 117440532,
-     "name" : "OMX_IndexConfigCommonContrast"
-    },
-    {
-     "enum_field_value" : 117440533,
-     "name" : "OMX_IndexConfigCommonBrightness"
-    },
-    {
-     "enum_field_value" : 117440534,
-     "name" : "OMX_IndexConfigCommonBacklight"
-    },
-    {
-     "enum_field_value" : 117440535,
-     "name" : "OMX_IndexConfigCommonGamma"
-    },
-    {
-     "enum_field_value" : 117440536,
-     "name" : "OMX_IndexConfigCommonSaturation"
-    },
-    {
-     "enum_field_value" : 117440537,
-     "name" : "OMX_IndexConfigCommonLightness"
-    },
-    {
-     "enum_field_value" : 117440538,
-     "name" : "OMX_IndexConfigCommonExclusionRect"
-    },
-    {
-     "enum_field_value" : 117440539,
-     "name" : "OMX_IndexConfigCommonDithering"
-    },
-    {
-     "enum_field_value" : 117440540,
-     "name" : "OMX_IndexConfigCommonPlaneBlend"
-    },
-    {
-     "enum_field_value" : 117440541,
-     "name" : "OMX_IndexConfigCommonExposureValue"
-    },
-    {
-     "enum_field_value" : 117440542,
-     "name" : "OMX_IndexConfigCommonOutputSize"
-    },
-    {
-     "enum_field_value" : 117440543,
-     "name" : "OMX_IndexParamCommonExtraQuantData"
-    },
-    {
-     "enum_field_value" : 117440544,
-     "name" : "OMX_IndexConfigCommonFocusRegion"
-    },
-    {
-     "enum_field_value" : 117440545,
-     "name" : "OMX_IndexConfigCommonFocusStatus"
-    },
-    {
-     "enum_field_value" : 117440546,
-     "name" : "OMX_IndexConfigCommonTransitionEffect"
-    },
-    {
-     "enum_field_value" : 117440547,
-     "name" : "OMX_IndexCommonEndUnused"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "OMX_IndexOtherStartUnused"
-    },
-    {
-     "enum_field_value" : 134217729,
-     "name" : "OMX_IndexParamOtherPortFormat"
-    },
-    {
-     "enum_field_value" : 134217730,
-     "name" : "OMX_IndexConfigOtherPower"
-    },
-    {
-     "enum_field_value" : 134217731,
-     "name" : "OMX_IndexConfigOtherStats"
-    },
-    {
-     "enum_field_value" : 150994944,
-     "name" : "OMX_IndexTimeStartUnused"
-    },
-    {
-     "enum_field_value" : 150994945,
-     "name" : "OMX_IndexConfigTimeScale"
-    },
-    {
-     "enum_field_value" : 150994946,
-     "name" : "OMX_IndexConfigTimeClockState"
-    },
-    {
-     "enum_field_value" : 150994947,
-     "name" : "OMX_IndexConfigTimeActiveRefClock"
-    },
-    {
-     "enum_field_value" : 150994948,
-     "name" : "OMX_IndexConfigTimeCurrentMediaTime"
-    },
-    {
-     "enum_field_value" : 150994949,
-     "name" : "OMX_IndexConfigTimeCurrentWallTime"
-    },
-    {
-     "enum_field_value" : 150994950,
-     "name" : "OMX_IndexConfigTimeCurrentAudioReference"
-    },
-    {
-     "enum_field_value" : 150994951,
-     "name" : "OMX_IndexConfigTimeCurrentVideoReference"
-    },
-    {
-     "enum_field_value" : 150994952,
-     "name" : "OMX_IndexConfigTimeMediaTimeRequest"
-    },
-    {
-     "enum_field_value" : 150994953,
-     "name" : "OMX_IndexConfigTimeClientStartTime"
-    },
-    {
-     "enum_field_value" : 150994954,
-     "name" : "OMX_IndexConfigTimePosition"
-    },
-    {
-     "enum_field_value" : 150994955,
-     "name" : "OMX_IndexConfigTimeSeekMode"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_IndexKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_IndexVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_IndexMax"
-    }
-   ],
-   "linker_set_key" : "OMX_INDEXTYPE",
-   "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_INDEXTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataCharsetUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataCharsetASCII"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataCharsetBinary"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataCharsetCodePage1252"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_MetadataCharsetUTF8"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_MetadataCharsetJavaConformantUTF8"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_MetadataCharsetUTF7"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_MetadataCharsetImapUTF7"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_MetadataCharsetUTF16LE"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_MetadataCharsetUTF16BE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_MetadataCharsetGB12345"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_MetadataCharsetHZGB2312"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_MetadataCharsetGB2312"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_MetadataCharsetGB18030"
-    },
-    {
-     "enum_field_value" : 14,
-     "name" : "OMX_MetadataCharsetGBK"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "OMX_MetadataCharsetBig5"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_MetadataCharsetISO88591"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_MetadataCharsetISO88592"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_MetadataCharsetISO88593"
-    },
-    {
-     "enum_field_value" : 19,
-     "name" : "OMX_MetadataCharsetISO88594"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_MetadataCharsetISO88595"
-    },
-    {
-     "enum_field_value" : 21,
-     "name" : "OMX_MetadataCharsetISO88596"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "OMX_MetadataCharsetISO88597"
-    },
-    {
-     "enum_field_value" : 23,
-     "name" : "OMX_MetadataCharsetISO88598"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_MetadataCharsetISO88599"
-    },
-    {
-     "enum_field_value" : 25,
-     "name" : "OMX_MetadataCharsetISO885910"
-    },
-    {
-     "enum_field_value" : 26,
-     "name" : "OMX_MetadataCharsetISO885913"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "OMX_MetadataCharsetISO885914"
-    },
-    {
-     "enum_field_value" : 28,
-     "name" : "OMX_MetadataCharsetISO885915"
-    },
-    {
-     "enum_field_value" : 29,
-     "name" : "OMX_MetadataCharsetShiftJIS"
-    },
-    {
-     "enum_field_value" : 30,
-     "name" : "OMX_MetadataCharsetISO2022JP"
-    },
-    {
-     "enum_field_value" : 31,
-     "name" : "OMX_MetadataCharsetISO2022JP1"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_MetadataCharsetISOEUCJP"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "OMX_MetadataCharsetSMS7Bit"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataCharsetKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataCharsetVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataCharsetTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATACHARSETTYPE",
-   "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATACHARSETTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataScopeAllLevels"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataScopeTopLevel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataScopePortLevel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MetadataScopeNodeLevel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataScopeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataScopeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataScopeTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASCOPETYPE",
-   "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASCOPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MetadataSearchValueSizeByIndex"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MetadataSearchItemByIndex"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MetadataSearchNextItemByKey"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MetadataSearchKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MetadataSearchVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MetadataSearchTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
-   "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METADATASEARCHMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MeteringModeAverage"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MeteringModeSpot"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MeteringModeMatrix"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MeteringKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MeteringVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EVModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_METERINGTYPE",
-   "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_METERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_MirrorNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_MirrorVertical"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_MirrorHorizontal"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_MirrorBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_MirrorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_MirrorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_MirrorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_MIRRORTYPE",
-   "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NaluFormatStartCodes"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_NaluFormatOneNaluPerBuffer"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_NaluFormatOneByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_NaluFormatTwoByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_NaluFormatFourByteInterleaveLength"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NaluFormatCodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NALUFORMATSTYPE",
-   "name" : "OMX_NALUFORMATSTYPE",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NALUFORMATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NumericalDataSigned"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_NumericalDataUnsigned"
-    },
-    {
-     "enum_field_value" : 2130706433,
-     "name" : "OMX_NumericalDataFloat"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_NumercialDataMax"
-    }
-   ],
-   "linker_set_key" : "OMX_NUMERICALDATATYPE",
-   "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_NUMERICALDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_OTHER_FormatTime"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_OTHER_FormatPower"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_OTHER_FormatStats"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_OTHER_FormatBinary"
-    },
-    {
-     "enum_field_value" : 1000,
-     "name" : "OMX_OTHER_FormatVendorReserved"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_OTHER_FormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_OTHER_FormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_OTHER_FormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_FORMATTYPE",
-   "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_OTHER_FORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_PortDomainAudio"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_PortDomainVideo"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_PortDomainImage"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_PortDomainOther"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_PortDomainKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_PortDomainVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 134217727,
-     "name" : "OMX_PortDomainMax"
-    }
-   ],
-   "linker_set_key" : "OMX_PORTDOMAINTYPE",
-   "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_PORTDOMAINTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_StateInvalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_StateLoaded"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_StateIdle"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_StateExecuting"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_StatePause"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_StateWaitForResources"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_StateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_StateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_StateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_STATETYPE",
-   "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_STATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_SuspensionDisabled"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_SuspensionEnabled"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionPolicyKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionPolicyStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspensionPolicyMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_NotSuspended"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Suspended"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_SuspensionKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_SuspensionVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_SuspendMax"
-    }
-   ],
-   "linker_set_key" : "OMX_SUSPENSIONTYPE",
-   "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_ClockStateRunning"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_ClockStateWaitingForStartTime"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_ClockStateStopped"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_ClockStateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_ClockStateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_ClockStateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CLOCKSTATE",
-   "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_CLOCKSTATE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_RefClockNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_RefClockAudio"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_RefClockVideo"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_RefClockKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_RefClockVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_RefClockMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
-   "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_REFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_SeekModeFast"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_SeekModeAccurate"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_SeekModeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_SeekModeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_SeekModeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
-   "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_TIME_UpdateRequestFulfillment"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_TIME_UpdateScaleChanged"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_TIME_UpdateClockStateChanged"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_TIME_UpdateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_TIME_UpdateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_TIME_UpdateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_UPDATETYPE",
-   "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TIME_UPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_EffectNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_EffectFadeFromBlack"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_EffectFadeToBlack"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_EffectUnspecifiedThroughConstantColor"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_EffectDissolve"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_EffectWipe"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_EffectUnspecifiedMixOfTwoScenes"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_EffectKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_EffectVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_EffectMax"
-    }
-   ],
-   "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AndroidTemporalLayeringPatternAndroid"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternWebRTC"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VPXTemporalLayerPatternMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "name" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLevel1b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCLevel11"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCLevel12"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCLevel13"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCLevel2"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCLevel21"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_AVCLevel22"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_AVCLevel3"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_AVCLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_AVCLevel32"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_AVCLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_AVCLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_AVCLevel42"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_AVCLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_AVCLevel51"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCLevel52"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_AVCLevel6"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_AVCLevel61"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCLevel62"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
-   "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_AVCLoopFilterEnable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCLoopFilterDisableSliceBoundary"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCLoopFilterKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCLoopFilterVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCLoopFilterMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedBaseline"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_AVCProfileConstrainedHigh"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "name" : "OMX_VIDEO_AVCPROFILEEXTTYPE",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILEEXTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_AVCProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_AVCProfileMain"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_AVCProfileExtended"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_AVCProfileHigh"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_AVCProfileHigh10"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_AVCProfileHigh422"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_AVCProfileHigh444"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_AVCProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_AVCProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_AVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
-   "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCDefault"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCMBSlice"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCByteSlice"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_SLICEMODE_AVCLevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_CodingUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_CodingAutoDetect"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_CodingMPEG2"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_CodingH263"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_CodingMPEG4"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_CodingWMV"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_VIDEO_CodingRV"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_VIDEO_CodingAVC"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_CodingMJPEG"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_VIDEO_CodingVP8"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "OMX_VIDEO_CodingVP9"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "OMX_VIDEO_CodingHEVC"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "OMX_VIDEO_CodingDolbyVision"
-    },
-    {
-     "enum_field_value" : 13,
-     "name" : "OMX_VIDEO_CodingImageHEIC"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_CodingKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_CodingVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_CodingMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
-   "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CODINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_ControlRateDisable"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_ControlRateVariable"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_ControlRateConstant"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_ControlRateVariableSkipFrames"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_Video_ControlRateConstantSkipFrames"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_Video_ControlRateConstantQuality"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_ControlRateKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_ControlRateVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_ControlRateMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
-   "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd24"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionLevelHd30"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd24"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd30"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionLevelFhd60"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd24"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd30"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd48"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionLevelUhd60"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionLevelmax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_DolbyVisionProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPer"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavPen"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDer"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDen"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtr"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheStn"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDth"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheDtb"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvheSt"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_DolbyVisionProfileDvavSe"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_DolbyVisionProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "name" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_DOLBYVISIONPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263Level10"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263Level20"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263Level30"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263Level40"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263Level45"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263Level50"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263Level60"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263Level70"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
-   "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_H263ProfileBaseline"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_H263ProfileH320Coding"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_H263ProfileBackwardCompatible"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_H263ProfileISWV2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_H263ProfileISWV3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_H263ProfileHighCompression"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_H263ProfileInternet"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_H263ProfileInterlace"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_H263ProfileHighLatency"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_H263ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_H263ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_H263ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
-   "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCLevelUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel21"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel21"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel3"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel3"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel31"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel31"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel4"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel4"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel41"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel41"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel5"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel5"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel51"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel51"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel52"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel52"
-    },
-    {
-     "enum_field_value" : 1048576,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel6"
-    },
-    {
-     "enum_field_value" : 2097152,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel6"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel61"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel61"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "OMX_VIDEO_HEVCMainTierLevel62"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "OMX_VIDEO_HEVCHighTierLevel62"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCHighTiermax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "name" : "OMX_VIDEO_HEVCLEVELTYPE",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCLEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_HEVCProfileUnknown"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_HEVCProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_HEVCProfileMain10"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_HEVCProfileMainStill"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_HEVCProfileMain10HDR10Plus"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_HEVCProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "name" : "OMX_VIDEO_HEVCPROFILETYPE",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_HEVCPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_IntraRefreshCyclic"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_IntraRefreshAdaptive"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_IntraRefreshBoth"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_IntraRefreshKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_IntraRefreshVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_IntraRefreshMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_Video_MotionVectorPixel"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_Video_MotionVectorHalfPel"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_Video_MotionVectorQuarterPel"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_Video_MotionVectorEighthPel"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_Video_MotionVectorKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_Video_MotionVectorVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_Video_MotionVectorMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2LevelLL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2LevelML"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2LevelH14"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2LevelHL"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2LevelHP"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_MPEG2ProfileSimple"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG2ProfileMain"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG2Profile422"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_MPEG2ProfileSNR"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG2ProfileSpatial"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_VIDEO_MPEG2ProfileHigh"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG2ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG2ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG2ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4Level0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4Level0b"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4Level1"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4Level2"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4Level3"
-    },
-    {
-     "enum_field_value" : 24,
-     "name" : "OMX_VIDEO_MPEG4Level3b"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4Level4"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4Level4a"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4Level5"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4Level6"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4LevelKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4LevelVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimple"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleScalable"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_MPEG4ProfileCore"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_MPEG4ProfileMain"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_MPEG4ProfileNbit"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_MPEG4ProfileScalableTexture"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFace"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_MPEG4ProfileSimpleFBA"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_MPEG4ProfileBasicAnimated"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_MPEG4ProfileHybrid"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedRealTime"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_MPEG4ProfileCoreScalable"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCoding"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedCore"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedScalable"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_MPEG4ProfileAdvancedSimple"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_MPEG4ProfileKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_MPEG4ProfileVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_MPEG4ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_PictureTypeI"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_PictureTypeP"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_PictureTypeB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_PictureTypeSI"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_PictureTypeSP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "OMX_VIDEO_PictureTypeEI"
-    },
-    {
-     "enum_field_value" : 18,
-     "name" : "OMX_VIDEO_PictureTypeEP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "OMX_VIDEO_PictureTypeS"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_PictureTypeKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_PictureTypeVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_PictureTypeMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
-   "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_PICTURETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_VIDEO_RVFormatUnused"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_RVFormat8"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_RVFormat9"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_VIDEO_RVFormatG2"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_RVFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_RVFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_RVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
-   "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8Level_Version0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP8Level_Version1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP8Level_Version2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP8Level_Version3"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8LEVELTYPE",
-   "name" : "OMX_VIDEO_VP8LEVELTYPE",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP8ProfileMain"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP8ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP8ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8PROFILETYPE",
-   "name" : "OMX_VIDEO_VP8PROFILETYPE",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP8PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Level1"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Level11"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Level2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Level21"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "OMX_VIDEO_VP9Level3"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "OMX_VIDEO_VP9Level31"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "OMX_VIDEO_VP9Level4"
-    },
-    {
-     "enum_field_value" : 128,
-     "name" : "OMX_VIDEO_VP9Level41"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "OMX_VIDEO_VP9Level5"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "OMX_VIDEO_VP9Level51"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "OMX_VIDEO_VP9Level52"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "OMX_VIDEO_VP9Level6"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Level61"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Level62"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9LevelUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9LevelMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9LEVELTYPE",
-   "name" : "OMX_VIDEO_VP9LEVELTYPE",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9LEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_VP9Profile0"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_VP9Profile1"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_VP9Profile2"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_VP9Profile3"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "OMX_VIDEO_VP9Profile2HDR"
-    },
-    {
-     "enum_field_value" : 8192,
-     "name" : "OMX_VIDEO_VP9Profile3HDR"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "OMX_VIDEO_VP9Profile2HDR10Plus"
-    },
-    {
-     "enum_field_value" : 32768,
-     "name" : "OMX_VIDEO_VP9Profile3HDR10Plus"
-    },
-    {
-     "enum_field_value" : 1862270975,
-     "name" : "OMX_VIDEO_VP9ProfileUnknown"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_VP9ProfileMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP9PROFILETYPE",
-   "name" : "OMX_VIDEO_VP9PROFILETYPE",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_VP9PROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_VIDEO_WMVFormatUnused"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_VIDEO_WMVFormat7"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_VIDEO_WMVFormat8"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_VIDEO_WMVFormat9"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_VIDEO_WMFFormatKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_VIDEO_WMFFormatVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_VIDEO_WMVFormatMax"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
-   "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "OMX_WhiteBalControlOff"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "OMX_WhiteBalControlAuto"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "OMX_WhiteBalControlSunLight"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "OMX_WhiteBalControlCloudy"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "OMX_WhiteBalControlShade"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "OMX_WhiteBalControlTungsten"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "OMX_WhiteBalControlFluorescent"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "OMX_WhiteBalControlIncandescent"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "OMX_WhiteBalControlFlash"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "OMX_WhiteBalControlHorizon"
-    },
-    {
-     "enum_field_value" : 1862270976,
-     "name" : "OMX_WhiteBalControlKhronosExtensions"
-    },
-    {
-     "enum_field_value" : 2130706432,
-     "name" : "OMX_WhiteBalControlVendorStartUnused"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "OMX_WhiteBalControlMax"
-    }
-   ],
-   "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
-   "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "OMX_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ADebug::kDebugNone"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ADebug::kDebugLifeCycle"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ADebug::kDebugState"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ADebug::kDebugConfig"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ADebug::kDebugInternalState"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugAll"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ADebug::kDebugMax"
-    }
-   ],
-   "linker_set_key" : "android::ADebug::Level",
-   "name" : "android::ADebug::Level",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android6ADebug5LevelE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::AMessage::kTypeInt32"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::AMessage::kTypeInt64"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::AMessage::kTypeSize"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::AMessage::kTypeFloat"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::AMessage::kTypeDouble"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::AMessage::kTypePointer"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::AMessage::kTypeString"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::AMessage::kTypeObject"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::AMessage::kTypeMessage"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::AMessage::kTypeRect"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::AMessage::kTypeBuffer"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Type",
-   "name" : "android::AMessage::Type",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android8AMessage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kAudioEncodingPcm16bit"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kAudioEncodingPcm8bit"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::kAudioEncodingPcmFloat"
-    }
-   ],
-   "linker_set_key" : "android::AudioEncoding",
-   "name" : "android::AudioEncoding",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android13AudioEncodingE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::MatrixUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::MatrixBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::MatrixBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::MatrixBT601_6"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::MatrixSMPTE240M"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::MatrixBT2020"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::MatrixBT2020Constant"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::MatrixOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
-   "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::PrimariesUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::PrimariesBT709_5"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::PrimariesBT470_6M"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::PrimariesBT601_6_625"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::PrimariesBT601_6_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::PrimariesGenericFilm"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::PrimariesBT2020"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::PrimariesOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Primaries",
-   "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::RangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::RangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::RangeLimited"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::RangeOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Range",
-   "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::StandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::StandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::StandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::StandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::StandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::StandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::StandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::StandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::StandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorAspects::StandardFilm"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::StandardOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Standard",
-   "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorAspects::TransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorAspects::TransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorAspects::TransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorAspects::TransferSMPTE170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorAspects::TransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorAspects::TransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorAspects::TransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::TransferHLG"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorAspects::TransferSMPTE240M"
-    },
-    {
-     "enum_field_value" : 65,
-     "name" : "android::ColorAspects::TransferXvYCC"
-    },
-    {
-     "enum_field_value" : 66,
-     "name" : "android::ColorAspects::TransferBT1361"
-    },
-    {
-     "enum_field_value" : 67,
-     "name" : "android::ColorAspects::TransferST428"
-    },
-    {
-     "enum_field_value" : 255,
-     "name" : "android::ColorAspects::TransferOther"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects::Transfer",
-   "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorRangeUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorRangeFull"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorRangeLimited"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorRangeExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorRangeVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorRange",
-   "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorStandardUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorStandardBT709"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorStandardBT601_625"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorStandardBT601_625_Unadjusted"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorStandardBT601_525"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorStandardBT601_525_Unadjusted"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorStandardBT2020"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorStandardBT2020Constant"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorStandardBT470M"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::ColorUtils::kColorStandardFilm"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDCI_P3"
-    },
-    {
-     "enum_field_value" : 64,
-     "name" : "android::ColorUtils::kColorStandardExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorStandardVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorStandard",
-   "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::ColorUtils::kColorTransferUnspecified"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::ColorUtils::kColorTransferLinear"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::ColorUtils::kColorTransferSRGB"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::ColorUtils::kColorTransferSMPTE_170M"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::ColorUtils::kColorTransferGamma22"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::ColorUtils::kColorTransferGamma28"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::ColorUtils::kColorTransferST2084"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::ColorUtils::kColorTransferHLG"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorUtils::kColorTransferGamma26"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "android::ColorUtils::kColorTransferExtendedStart"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "android::ColorUtils::kColorTransferVendorStart"
-    }
-   ],
-   "linker_set_key" : "android::ColorUtils::ColorTransfer",
-   "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::HDRStaticInfo::kType1"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::ID",
-   "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-5",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::V"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::R"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::G"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::B"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::A"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneIndex",
-   "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUV"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_YUVA"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGB"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_RGBA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaImage2::MEDIA_IMAGE_TYPE_Y"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::Type",
-   "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android11MediaImage24TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::Y"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::U"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaImage::V"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaImage::MAX_NUM_PLANES"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneIndex",
-   "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaImage::MEDIA_IMAGE_TYPE_YUV"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::Type",
-   "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10MediaImage4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::kMetadataBufferTypeCameraSource"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::kMetadataBufferTypeGrallocSource"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::kMetadataBufferTypeANWBuffer"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::kMetadataBufferTypeNativeHandleSource"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "android::kMetadataBufferTypeInvalid"
-    }
-   ],
-   "linker_set_key" : "android::MetadataBufferType",
-   "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-30",
-   "unique_id" : "android::MetadataBufferType"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropUnSet"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropSet"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::SoftVideoDecoderOMXComponent::kCropChanged"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "name" : "android::SoftVideoDecoderOMXComponent::CropSettingsMode",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponent16CropSettingsModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *)",
-   "name" : "OMX_ERRORTYPE (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-263",
-   "self_type" : "type-302",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-263",
-   "self_type" : "type-297",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-263",
-   "self_type" : "type-293",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-263",
-   "self_type" : "type-291",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-263",
-   "self_type" : "type-304",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_CALLBACKTYPE *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-300"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-263",
-   "self_type" : "type-299",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-263",
-   "self_type" : "type-274",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_INDEXTYPE, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-263",
-   "self_type" : "type-277",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (void *, OMX_STATETYPE *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-263",
-   "self_type" : "type-283",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-263",
-   "self_type" : "type-280",
-   "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])",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-271"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-263",
-   "self_type" : "type-270",
-   "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)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-263",
-   "self_type" : "type-306",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-263",
-   "self_type" : "type-295",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-263",
-   "self_type" : "type-286",
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-263",
-   "self_type" : "type-266",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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 *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-263",
-   "self_type" : "type-262",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "referenced_type" : "type-768",
-   "return_type" : "type-30",
-   "self_type" : "type-768",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::SoftOMXPlugin::enumerateComponents",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::getRolesOfComponent",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-970"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::makeComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::destroyComponentInstance",
-   "linker_set_key" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "function_name" : "android::SoftOMXPlugin::SoftOMXPlugin",
-   "linker_set_key" : "_ZN7android13SoftOMXPluginC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-974"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::setLibHandle",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setLibHandleEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetStateWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15GetStateWrapperEPvP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16GetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetConfigWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16SetConfigWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::UseBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent16UseBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_jPh",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FreeBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17FreeBufferWrapperEPvjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SendCommandWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent18SendCommandWrapperEPv15OMX_COMMANDTYPEjS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19GetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::SetParameterWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent19SetParameterWrapperEPv13OMX_INDEXTYPES1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyFillBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent20notifyFillBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::AllocateBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21AllocateBufferWrapperEPvPP20OMX_BUFFERHEADERTYPEjS1_j",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::FillThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21FillThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notifyEmptyBufferDone",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent21notifyEmptyBufferDoneEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::EmptyThisBufferWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent22EmptyThisBufferWrapperEPvP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftOMXComponent::GetExtensionIndexWrapper",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent24GetExtensionIndexWrapperEPvPcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::notify",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent6notifyE13OMX_EVENTTYPEjjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-264"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::~SoftOMXComponent",
-   "linker_set_key" : "_ZN7android16SoftOMXComponentD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-678"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::freeBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlush",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11onPortFlushEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::sendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::editPortInfo",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12editPortInfoEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-346",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::getPortQueue",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12getPortQueueEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-733",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnable",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12onPortEnableEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onChangeState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onChangeStateE13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-236"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onQueueFilled",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::onSendCommand",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent13onSendCommandE15OMX_COMMANDTYPEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-275"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::allocateBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::fillThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::emptyThisBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-210"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::checkTransitions",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent16checkTransitionsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::onMessageReceived",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent17onMessageReceivedERKNS_2spINS_8AMessageEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-923"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortFlushCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::prepareForDestruction",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::addPort",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7addPortERK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-790"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SimpleSoftOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::getState",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-284"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::setConfig",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::useBuffer",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-209"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC1EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SimpleSoftOMXComponent::SimpleSoftOMXComponent",
-   "linker_set_key" : "_ZN7android22SimpleSoftOMXComponentC2EPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-235"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dumpColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent16dumpColorAspectsERKNS_12ColorAspectsE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    },
-    {
-     "referenced_type" : "type-793"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferWidth",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent17outputBufferWidthEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::colorAspectsDiffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18colorAspectsDifferERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::outputBufferHeight",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent18outputBufferHeightEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onPortEnableCompleted",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updatePortDefinitions",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::queueOutputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent22queueOutputFrameConfigERKNS_2spINS_7ABufferEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-191"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::dequeueInputFrameConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23dequeueInputFrameConfigEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::updateFinalColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent23updateFinalColorAspectsERKNS_12ColorAspectsES3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-322"
-    },
-    {
-     "referenced_type" : "type-322"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getColorAspectPreference",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handleColorAspectsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handleColorAspectsChangeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::handlePortSettingsChange",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent24handlePortSettingsChangeEPbjj20OMX_COLOR_FORMATTYPENS0_16CropSettingsModeEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-793"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-15"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-309"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::copyYV12FrameToOutputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent27copyYV12FrameToOutputBufferEPhPKhS3_S3_jjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdr10PlusInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportDescribeHdrStaticInfo",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::supportsDescribeColorAspects",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::onReset",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::getConfig",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoDecoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponent9initPortsEjjjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoDecoderOMXComponent::SoftVideoDecoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoDecoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-307"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::updatePortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent16updatePortParamsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::getExtensionIndex",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-281"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::validateInputBuffer",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent19validateInputBufferEPK20OMX_BUFFERHEADERTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertRGB32ToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20ConvertRGB32ToPlanarEPhjjPKhjjjb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalGetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetParameter",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::internalSetPortParams",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent21internalSetPortParamsEPK28OMX_PARAM_PORTDEFINITIONTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-680"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertFlexYUVToPlanar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent22ConvertFlexYUVToPlanarEPhjjP13android_ycbcrii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::ConvertYUV420SemiPlanarToYUV420Planar",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent37ConvertYUV420SemiPlanarToYUV420PlanarEPKhPhii",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::initPorts",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponent9initPortsEjjjPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC1EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftVideoEncoderOMXComponent::SoftVideoEncoderOMXComponent",
-   "linker_set_key" : "_ZN7android28SoftVideoEncoderOMXComponentC2EPKcS2_20OMX_VIDEO_CODINGTYPEPKNS_17CodecProfileLevelEjiiPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-372"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-111"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-226"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "referenced_type" : "type-258"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-789"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_compare",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-399"
-    }
-   ],
-   "return_type" : "type-30",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_destroy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_construct",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_forward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_move_backward",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_copy",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >::do_splat",
-   "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-691"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftOMXComponent::name",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent4nameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-111",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::initCheck",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9initCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-263",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "function_name" : "android::SoftOMXComponent::libHandle",
-   "linker_set_key" : "_ZNK7android16SoftOMXComponent9libHandleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-954"
-    }
-   ],
-   "return_type" : "type-99",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::SimpleSoftOMXComponent::isSetParameterAllowed",
-   "linker_set_key" : "_ZNK7android22SimpleSoftOMXComponent21isSetParameterAllowedE13OMX_INDEXTYPEPv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-939"
-    },
-    {
-     "referenced_type" : "type-278"
-    },
-    {
-     "referenced_type" : "type-791"
-    }
-   ],
-   "return_type" : "type-88",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::SoftVideoEncoderOMXComponent::extractGraphicBuffer",
-   "linker_set_key" : "_ZNK7android28SoftVideoEncoderOMXComponent20extractGraphicBufferEPhjPKhjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-212"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-310"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-310",
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-699"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_destroy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_construct",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_forward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_move_backward",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_copy",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>::do_splat",
-   "linker_set_key" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    },
-    {
-     "referenced_type" : "type-99"
-    },
-    {
-     "referenced_type" : "type-399"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-722",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-131",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-700",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *&",
-   "referenced_type" : "type-255",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const &",
-   "referenced_type" : "type-708",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-250",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &",
-   "name" : "android::sp<android::ABuffer> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> &",
-   "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> &",
-   "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-70",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE &",
-   "referenced_type" : "type-679",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString &",
-   "name" : "const android::AString &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ColorAspects &",
-   "name" : "const android::ColorAspects &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> &",
-   "referenced_type" : "type-724",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo &",
-   "referenced_type" : "type-354",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-962",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
-   "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-386",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> &",
-   "name" : "const android::sp<android::ABuffer> &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > &",
-   "referenced_type" : "type-822",
-   "self_type" : "type-840",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> &",
-   "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-639",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> &",
-   "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-383",
-   "self_type" : "type-394",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-426",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-313",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-420",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *&",
-   "name" : "const void *&",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int &",
-   "name" : "unsigned int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-397",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *&",
-   "name" : "void *&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-396",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "ANativeWindowBuffer *",
-   "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
-   "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
-   "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CALLBACKTYPE *",
-   "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE *",
-   "name" : "OMX_COMPONENTTYPE *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_COMPONENTTYPE **",
-   "name" : "OMX_COMPONENTTYPE **",
-   "referenced_type" : "type-267",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE *",
-   "name" : "OMX_CONFIG_RECTTYPE *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-293",
-   "self_type" : "type-292",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-291",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-304",
-   "self_type" : "type-303",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-274",
-   "self_type" : "type-273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "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-280",
-   "self_type" : "type-279",
-   "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-270",
-   "self_type" : "type-269",
-   "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-306",
-   "self_type" : "type-305",
-   "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-295",
-   "self_type" : "type-294",
-   "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-286",
-   "self_type" : "type-285",
-   "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-266",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "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-262",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_INDEXTYPE *",
-   "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-685",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_STATETYPE *",
-   "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
-   "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VERSIONTYPE *",
-   "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ABuffer *",
-   "name" : "android::ABuffer *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandler *",
-   "name" : "android::AHandler *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper *",
-   "name" : "android::ALooper *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AMessage *",
-   "name" : "android::AMessage *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AReplyToken *",
-   "name" : "android::AReplyToken *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::AString *",
-   "name" : "android::AString *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeColorAspectsParams *",
-   "name" : "android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams *",
-   "name" : "android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-707",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-331",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<BufferInfo *>::_Node *",
-   "name" : "android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> > *",
-   "name" : "android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-132",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node *",
-   "name" : "android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-972",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-786",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent *",
-   "name" : "android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-235",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXComponent *",
-   "name" : "android::SoftOMXComponent *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftOMXPlugin *",
-   "name" : "android::SoftOMXPlugin *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent *",
-   "name" : "android::SoftVideoDecoderOMXComponent *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent *",
-   "name" : "android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-345",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> *",
-   "name" : "android::sp<android::ABuffer> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-341",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SoftOMXComponent> *",
-   "name" : "android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-930",
-   "self_type" : "type-933",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-67",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE *",
-   "name" : "const OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_CALLBACKTYPE *",
-   "name" : "const OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-356",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ABuffer *",
-   "name" : "const android::ABuffer *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-918",
-   "self_type" : "type-920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-464",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CodecProfileLevel *",
-   "name" : "const android::CodecProfileLevel *",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeColorAspectsParams *",
-   "name" : "const android::DescribeColorAspectsParams *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams *",
-   "name" : "const android::DescribeHDRStaticInfoParams *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR> *",
-   "referenced_type" : "type-724",
-   "self_type" : "type-726",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node *",
-   "name" : "const android::List<BufferInfo *>::_Node *",
-   "referenced_type" : "type-711",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *> *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> > *",
-   "name" : "const android::List<android::sp<android::ABuffer> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node *",
-   "name" : "const android::List<sp<ABuffer> >::_Node *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams *",
-   "name" : "const android::PrepareForAdaptivePlaybackParams *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent *",
-   "name" : "const android::SimpleSoftOMXComponent *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftOMXComponent *",
-   "name" : "const android::SoftOMXComponent *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent *",
-   "name" : "const android::SoftVideoEncoderOMXComponent *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "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-690",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams *",
-   "name" : "const android::StoreMetaDataInBuffersParams *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo> *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-333",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ABuffer> *",
-   "name" : "const android::sp<android::ABuffer> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-308",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-929",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-927",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-936",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent> *",
-   "name" : "const android::sp<android::SoftOMXComponent> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> *",
-   "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent> *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-313",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-768",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "native_handle *",
-   "name" : "native_handle *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char (*)[128]",
-   "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-20",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-99",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo *const",
-   "referenced_type" : "type-255",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "const OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-683",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "const OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-681",
-   "size" : 104,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_BUFFERHEADERTYPE",
-   "name" : "const OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-377",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_CALLBACKTYPE",
-   "name" : "const OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "const OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 136,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "const OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-679",
-   "size" : 96,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "const OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-355",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ABuffer",
-   "name" : "const android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-138",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AHandler",
-   "name" : "const android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-932",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ALooper",
-   "name" : "const android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-787",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AReplyToken",
-   "name" : "const android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AString",
-   "name" : "const android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-454",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CodecProfileLevel",
-   "name" : "const android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ColorAspects",
-   "name" : "const android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-312",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeColorAspectsParams",
-   "name" : "const android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-46",
-   "size" : 44,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::DescribeHDRStaticInfoParams",
-   "name" : "const android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-49",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::LightRefBase<android::Fence>",
-   "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "const android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<BufferInfo *>::_Node",
-   "name" : "const android::List<BufferInfo *>::_Node",
-   "referenced_type" : "type-254",
-   "self_type" : "type-711",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "const android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-731",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<android::sp<android::ABuffer> >",
-   "name" : "const android::List<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-58",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "referenced_type" : "type-125",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "const android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::List<sp<ABuffer> >::_Node",
-   "name" : "const android::List<sp<ABuffer> >::_Node",
-   "referenced_type" : "type-60",
-   "self_type" : "type-114",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::PrepareForAdaptivePlaybackParams",
-   "name" : "const android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-89",
-   "self_type" : "type-439",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent",
-   "name" : "const android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-938",
-   "size" : 76,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "const android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-352",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "const android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-354",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftOMXComponent",
-   "name" : "const android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-953",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SoftVideoEncoderOMXComponent",
-   "name" : "const android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-375",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-690",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::StoreMetaDataInBuffersParams",
-   "name" : "const android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-357",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-960",
-   "self_type" : "type-962",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-696",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "const android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-702",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-98",
-   "self_type" : "type-687",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-333",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
-   "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
-   "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-385",
-   "self_type" : "type-384",
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ABuffer>",
-   "name" : "const android::sp<android::ABuffer>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "const android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::ALooper>",
-   "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::AMessage>",
-   "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-922",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Fence>",
-   "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::sp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-729",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::SoftOMXComponent>",
-   "name" : "const android::sp<android::SoftOMXComponent>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-979",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::ALooper>",
-   "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-70",
-   "self_type" : "type-618",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "const android::wp<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-741",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-79",
-   "self_type" : "type-112",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-111",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-107",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-106",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-30",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-428",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-199",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-5",
-   "self_type" : "type-311",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-136",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-44",
-   "self_type" : "type-424",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-100",
-   "self_type" : "type-400",
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-99",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-88",
-   "self_type" : "type-766",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBalance",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBass",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 160,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "bIsMIDI",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sDelay",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sModulationRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nModulationDepth",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFeedback",
-     "field_offset" : 352,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
-   "size" : 56,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEchoCancelation",
-     "field_offset" : 96,
-     "referenced_type" : "type-531"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sBandIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sCenterFreq",
-     "field_offset" : 224,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sBandLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLoudness",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sPitchTransposition",
-     "field_offset" : 96,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sPlayBackRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sTempo",
-     "field_offset" : 288,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nMaxPolyphony",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRepeat",
-     "field_offset" : 416,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStopTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannelMuteMask",
-     "field_offset" : 480,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nChannelSoloMask",
-     "field_offset" : 496,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nTrack0031MuteMask",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263MuteMask",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack0031SoloMask",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack3263SoloMask",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEventSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMidiEvents",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nData",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetaEventType",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nMetaEventSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTrack",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannel",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDProgram",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nIDSoundBank",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nUserSoundBankIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumTracks",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nDuration",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPosition",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bVibra",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nNumMetaEvents",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumActiveVoices",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMIDIPlayBackState",
-     "field_offset" : 288,
-     "referenced_type" : "type-511"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bMute",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bNoiseReduction",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sRoomLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sRoomHighFreqLevel",
-     "field_offset" : 224,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsLevel",
-     "field_offset" : 320,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReflectionsDelay",
-     "field_offset" : 416,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sReverbLevel",
-     "field_offset" : 512,
-     "referenced_type" : "type-445"
-    },
-    {
-     "field_name" : "sReverbDelay",
-     "field_offset" : 608,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "sDecayTime",
-     "field_offset" : 704,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDecayHighFreqRatio",
-     "field_offset" : 800,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "nDensity",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDiffusion",
-     "field_offset" : 928,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sReferenceHighFreq",
-     "field_offset" : 960,
-     "referenced_type" : "type-444"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
-   "size" : 132,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eWideningType",
-     "field_offset" : 128,
-     "referenced_type" : "type-527"
-    },
-    {
-     "field_name" : "nStereoWidening",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTreble",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bLinear",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sVolume",
-     "field_offset" : 128,
-     "referenced_type" : "type-445"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameLength",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACtools",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAACERtools",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAACProfile",
-     "field_offset" : 320,
-     "referenced_type" : "type-465"
-    },
-    {
-     "field_name" : "eAACStreamFormat",
-     "field_offset" : 352,
-     "referenced_type" : "type-463"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-460"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerSample",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAMRBandMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-485"
-    },
-    {
-     "field_name" : "eAMRDTXMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-487"
-    },
-    {
-     "field_name" : "eAMRFrameFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-484"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCompressionLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-478"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
-   "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eG726Mode",
-     "field_offset" : 128,
-     "referenced_type" : "type-480"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
-   "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eBitType",
-     "field_offset" : 160,
-     "referenced_type" : "type-482"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
-   "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDLSSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pDLSData",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "eMidiSoundBank",
-     "field_offset" : 192,
-     "referenced_type" : "type-505"
-    },
-    {
-     "field_name" : "eMidiSoundBankLayout",
-     "field_offset" : 224,
-     "referenced_type" : "type-506"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFileSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sMaxPolyphony",
-     "field_offset" : 128,
-     "referenced_type" : "type-444"
-    },
-    {
-     "field_name" : "bLoadDefaultSound",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eMidiFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 224,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-461"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNumData",
-     "field_offset" : 128,
-     "referenced_type" : "type-443"
-    },
-    {
-     "field_name" : "eEndian",
-     "field_offset" : 160,
-     "referenced_type" : "type-442"
-    },
-    {
-     "field_name" : "bInterleaved",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitPerSample",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePCMMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-456"
-    },
-    {
-     "field_name" : "eChannelMapping",
-     "field_offset" : 320,
-     "referenced_type" : "type-459"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 128,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 160,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitsPerFrame",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSamplePerFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingQuantBits",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCouplingStartRegion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumRegions",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
-   "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlocks",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSubbands",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitPool",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableBitrate",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eChannelMode",
-     "field_offset" : 320,
-     "referenced_type" : "type-460"
-    },
-    {
-     "field_name" : "eSBCAllocType",
-     "field_offset" : 352,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCDMARate",
-     "field_offset" : 128,
-     "referenced_type" : "type-498"
-    },
-    {
-     "field_name" : "bRATE_REDUCon",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bNoiseSuppressor",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDTX",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bHiPassFilter",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMinBitRate",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxBitRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSampleRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAudioBandWidth",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQuality",
-     "field_offset" : 288,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bManaged",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDownmix",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nChannels",
-     "field_offset" : 96,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nBitRate",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-469"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 192,
-     "referenced_type" : "type-470"
-    },
-    {
-     "field_name" : "nSamplingRate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBlockAlign",
-     "field_offset" : 256,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nEncodeOptions",
-     "field_offset" : 272,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nSuperBlockAlign",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
-   "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eEncoding",
-     "field_offset" : 96,
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_BS32",
-   "name" : "OMX_BS32",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BS32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMin",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMax",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BU32",
-   "name" : "OMX_BU32",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_BU32"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "nAllocLen",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFilledLen",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 192,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pPlatformPrivate",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pInputPortPrivate",
-     "field_offset" : 256,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pOutputPortPrivate",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "hMarkTargetComponent",
-     "field_offset" : 320,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nTickCount",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeStamp",
-     "field_offset" : 416,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nFlags",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nOutputPortIndex",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nInputPortIndex",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_BUFFERHEADERTYPE",
-   "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_BUFFERHEADERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "EventHandler",
-     "referenced_type" : "type-261"
-    },
-    {
-     "field_name" : "EmptyBufferDone",
-     "field_offset" : 32,
-     "referenced_type" : "type-265"
-    },
-    {
-     "field_name" : "FillBufferDone",
-     "field_offset" : 64,
-     "referenced_type" : "type-265"
-    }
-   ],
-   "linker_set_key" : "OMX_CALLBACKTYPE",
-   "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_CALLBACKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pName",
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "pInitialize",
-     "field_offset" : 32,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
-   "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_COMPONENTREGISTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "pComponentPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pApplicationPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "GetComponentVersion",
-     "field_offset" : 128,
-     "referenced_type" : "type-269"
-    },
-    {
-     "field_name" : "SendCommand",
-     "field_offset" : 160,
-     "referenced_type" : "type-273"
-    },
-    {
-     "field_name" : "GetParameter",
-     "field_offset" : 192,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetParameter",
-     "field_offset" : 224,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetConfig",
-     "field_offset" : 256,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "SetConfig",
-     "field_offset" : 288,
-     "referenced_type" : "type-276"
-    },
-    {
-     "field_name" : "GetExtensionIndex",
-     "field_offset" : 320,
-     "referenced_type" : "type-279"
-    },
-    {
-     "field_name" : "GetState",
-     "field_offset" : 352,
-     "referenced_type" : "type-282"
-    },
-    {
-     "field_name" : "ComponentTunnelRequest",
-     "field_offset" : 384,
-     "referenced_type" : "type-285"
-    },
-    {
-     "field_name" : "UseBuffer",
-     "field_offset" : 416,
-     "referenced_type" : "type-290"
-    },
-    {
-     "field_name" : "AllocateBuffer",
-     "field_offset" : 448,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "FreeBuffer",
-     "field_offset" : 480,
-     "referenced_type" : "type-294"
-    },
-    {
-     "field_name" : "EmptyThisBuffer",
-     "field_offset" : 512,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "FillThisBuffer",
-     "field_offset" : 544,
-     "referenced_type" : "type-296"
-    },
-    {
-     "field_name" : "SetCallbacks",
-     "field_offset" : 576,
-     "referenced_type" : "type-298"
-    },
-    {
-     "field_name" : "ComponentDeInit",
-     "field_offset" : 608,
-     "referenced_type" : "type-301"
-    },
-    {
-     "field_name" : "UseEGLImage",
-     "field_offset" : 640,
-     "referenced_type" : "type-303"
-    },
-    {
-     "field_name" : "ComponentRoleEnum",
-     "field_offset" : 672,
-     "referenced_type" : "type-305"
-    }
-   ],
-   "linker_set_key" : "OMX_COMPONENTTYPE",
-   "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 88,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_COMPONENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cName",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 1120,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nParamCount",
-     "field_offset" : 1152,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "param",
-     "field_offset" : 1216,
-     "referenced_type" : "type-392"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 416,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cKey",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueType",
-     "field_offset" : 1024,
-     "referenced_type" : "type-388"
-    },
-    {
-     "field_name" : "bSet",
-     "field_offset" : 1056,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_offset" : 1088,
-     "referenced_type" : "type-390"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 264,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nInt32",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nInt64",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "cString",
-     "referenced_type" : "type-20"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "name" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 128,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h",
-   "unique_id" : "OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_IndexExt.h:137:5)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBacklight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeout",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
-   "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBrightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bContinuous",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFrameLimited",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFrameLimit",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRGBAlphaConstant",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eColorBlend",
-     "field_offset" : 128,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
-   "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xColorMatrix",
-     "field_offset" : 96,
-     "referenced_type" : "type-535"
-    },
-    {
-     "field_name" : "xColorOffset",
-     "field_offset" : 384,
-     "referenced_type" : "type-537"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 64,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bColorEnhancement",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCustomizedU",
-     "field_offset" : 128,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nCustomizedV",
-     "field_offset" : 136,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBColor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nARGBMask",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
-   "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumNodes",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nParentNodeID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNodeID",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cNodeName",
-     "field_offset" : 192,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "bIsLeafType",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nContrast",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
-   "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDither",
-     "field_offset" : 96,
-     "referenced_type" : "type-571"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
-   "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_DITHERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eExposureControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-555"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMetering",
-     "field_offset" : 96,
-     "referenced_type" : "type-574"
-    },
-    {
-     "field_name" : "xEVCompensation",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nApertureFNumber",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoAperture",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nShutterSpeedMsec",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoShutterSpeed",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nSensitivity",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bAutoSensitivity",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bCenter",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeft",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRight",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTop",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottom",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeft",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRight",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeft",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRight",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xEncodeFramerate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
-   "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStab",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
-   "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGamma",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
-   "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_GAMMATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eImageFilter",
-     "field_offset" : 96,
-     "referenced_type" : "type-539"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "IntraRefreshVOP",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLightness",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nErrMapSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ErrMap",
-     "field_offset" : 128,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eScopeMode",
-     "field_offset" : 64,
-     "referenced_type" : "type-664"
-    },
-    {
-     "field_name" : "nScopeSpecifier",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMetadataItemIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSearchMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-665"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 192,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 224,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 232,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "eValueCharset",
-     "field_offset" : 1280,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "sLanguageCountry",
-     "field_offset" : 1312,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "nValueMaxSize",
-     "field_offset" : 1344,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValueSizeUsed",
-     "field_offset" : 1376,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 1408,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
-   "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
-   "size" : 180,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eMirror",
-     "field_offset" : 96,
-     "referenced_type" : "type-547"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
-   "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_MIRRORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDepth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAlpha",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nX",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nY",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_POINTTYPE",
-   "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_POINTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLeft",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nTop",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_RECTTYPE",
-   "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_RECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRotation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
-   "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSaturation",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
-   "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "xHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eEffect",
-     "field_offset" : 96,
-     "referenced_type" : "type-566"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eWhiteBalControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-553"
-    }
-   ],
-   "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_FRAMESIZETYPE",
-   "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_FRAMESIZETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-624"
-    },
-    {
-     "field_name" : "nFocusSteps",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFocusStepIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFlashControl",
-     "field_offset" : 96,
-     "referenced_type" : "type-622"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eHuffmanTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-632"
-    },
-    {
-     "field_name" : "nNumberOfHuffmanCodeOfLength",
-     "field_offset" : 128,
-     "referenced_type" : "type-634"
-    },
-    {
-     "field_name" : "nHuffmanTable",
-     "field_offset" : 256,
-     "referenced_type" : "type-635"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 288,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQFactor",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eQuantizationTable",
-     "field_offset" : 96,
-     "referenced_type" : "type-629"
-    },
-    {
-     "field_name" : "nQuantizationMatrix",
-     "field_offset" : 128,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 224,
-     "referenced_type" : "type-247"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 288,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "pMarkData",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_MARKTYPE",
-   "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_MARKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eNaluFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "OMX_NALSTREAMFORMATTYPE",
-   "name" : "OMX_NALSTREAMFORMATTYPE",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_NALSTREAMFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnablePM",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 96,
-     "referenced_type" : "type-450"
-    },
-    {
-     "field_name" : "nDataSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
-   "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_OTHER_EXTRADATATYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eFormat",
-     "referenced_type" : "type-249"
-    }
-   ],
-   "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eBufferSupplier",
-     "field_offset" : 96,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "cRole",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
-   "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "hPipe",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
-   "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "contentURI",
-     "field_offset" : 64,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
-   "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_CONTENTURITYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUnitType",
-     "field_offset" : 96,
-     "referenced_type" : "type-568"
-    },
-    {
-     "field_name" : "eEncapsulationType",
-     "field_offset" : 128,
-     "referenced_type" : "type-569"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
-   "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DATAUNITTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDeblocking",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFocusStatus",
-     "field_offset" : 96,
-     "referenced_type" : "type-577"
-    },
-    {
-     "field_name" : "bCenterStatus",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bLeftStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bRightStatus",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopStatus",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomStatus",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopLeftStatus",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bTopRightStatus",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomLeftStatus",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bBottomRightStatus",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nInterleavePortIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
-   "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMacroblocks",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bAllKeys",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eKeyCharset",
-     "field_offset" : 96,
-     "referenced_type" : "type-663"
-    },
-    {
-     "field_name" : "nKeySizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKey",
-     "field_offset" : 160,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "nLanguageCountrySizeUsed",
-     "field_offset" : 1184,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nLanguageCountry",
-     "field_offset" : 1216,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 2240,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
-   "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 284,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eDir",
-     "field_offset" : 96,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "nBufferCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferCountMin",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBufferSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bPopulated",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eDomain",
-     "field_offset" : 288,
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 320,
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "bBuffersContiguous",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBufferAlignment",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 96,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "audio",
-     "referenced_type" : "type-243"
-    },
-    {
-     "field_name" : "video",
-     "referenced_type" : "type-245"
-    },
-    {
-     "field_name" : "image",
-     "referenced_type" : "type-246"
-    },
-    {
-     "field_name" : "other",
-     "referenced_type" : "type-248"
-    }
-   ],
-   "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-242",
-   "self_type" : "type-242",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bOneShot",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sFrameSize",
-     "field_offset" : 160,
-     "referenced_type" : "type-545"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
-   "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "unique_id" : "OMX_PARAM_SENSORMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "ePolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-654"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
-   "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nU32",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PARAM_U32TYPE",
-   "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_PARAM_U32TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPorts",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStartPortNumber",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PORT_PARAM_TYPE",
-   "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PORT_PARAM_TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nGroupPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGroupID",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
-   "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_PRIORITYMGMTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bResourceConcealmentForbidden",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
-   "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eClock",
-     "field_offset" : 64,
-     "referenced_type" : "type-642"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 64,
-     "referenced_type" : "type-643"
-    },
-    {
-     "field_name" : "nStartTime",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWaitMask",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pClientPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
-   "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eType",
-     "field_offset" : 64,
-     "referenced_type" : "type-637"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimestamp",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nClientPrivate",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eUpdateType",
-     "field_offset" : 96,
-     "referenced_type" : "type-641"
-    },
-    {
-     "field_name" : "nMediaTimestamp",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nOffset",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nWallTimeAtMediaTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "xScale",
-     "field_offset" : 320,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "eState",
-     "field_offset" : 352,
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
-   "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "unique_id" : "OMX_TIME_MEDIATIMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupplier",
-     "field_offset" : 32,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "OMX_TUNNELSETUPTYPE",
-   "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "unique_id" : "OMX_TUNNELSETUPTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "s",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nVersion",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VERSIONTYPE",
-   "name" : "OMX_VERSIONTYPE",
-   "record_kind" : "union",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "unique_id" : "OMX_VERSIONTYPE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "nVersionMajor",
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nVersionMinor",
-     "field_offset" : 8,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nRevision",
-     "field_offset" : 16,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nStep",
-     "field_offset" : 24,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "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-4",
-   "self_type" : "type-4",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefreshPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 224,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 60,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDRPeriod",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nEncodeBitrate",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNaluBytes",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnabled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGridCols",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eSupportedPatterns",
-     "field_offset" : 96,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nLayerCountMax",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountMax",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "ePattern",
-     "field_offset" : 192,
-     "referenced_type" : "type-184"
-    },
-    {
-     "field_name" : "nPLayerCountActual",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBLayerCountActual",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bBitrateRatiosSpecified",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nBitrateRatios",
-     "field_offset" : 320,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 72,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eTemporalPattern",
-     "field_offset" : 128,
-     "referenced_type" : "type-168"
-    },
-    {
-     "field_name" : "nTemporalLayerCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTemporalLayerBitrateRatio",
-     "field_offset" : 192,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "nMinQuantizer",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxQuantizer",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "name" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumSliceGroups",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "nSliceGroupMapType",
-     "field_offset" : 104,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "eSliceMode",
-     "field_offset" : 128,
-     "referenced_type" : "type-616"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUseHadamard",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nRefFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx10ActiveMinus1",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nRefIdx11ActiveMinus1",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableUEP",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableFMO",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableASO",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRS",
-     "field_offset" : 416,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 448,
-     "referenced_type" : "type-605"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 480,
-     "referenced_type" : "type-606"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFrameMBsOnly",
-     "field_offset" : 544,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bMBAFF",
-     "field_offset" : 576,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEntropyCodingCABAC",
-     "field_offset" : 608,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bWeightedPPrediction",
-     "field_offset" : 640,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nWeightedBipredicitonMode",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bconstIpred",
-     "field_offset" : 704,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirect8x8Inference",
-     "field_offset" : 736,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDirectSpatialTemporal",
-     "field_offset" : 768,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nCabacInitIdc",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLoopFilterMode",
-     "field_offset" : 832,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
-   "size" : 108,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eControlRate",
-     "field_offset" : 96,
-     "referenced_type" : "type-581"
-    },
-    {
-     "field_offset" : 128,
-     "referenced_type" : "type-583"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQualityFactor",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
-   "record_kind" : "union",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "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)"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableHEC",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableResync",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nResynchMarkerSpacing",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableDataPartitioning",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableRVLC",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-591"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-592"
-    },
-    {
-     "field_name" : "bPLUSPTYPEAllowed",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bForceRoundingTypeToZero",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPictureHeaderRepetition",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nGOBHeaderInterval",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
-   "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-175"
-    },
-    {
-     "field_name" : "nKeyFrameInterval",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "name" : "OMX_VIDEO_PARAM_HEVCTYPE",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_HEVCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eRefreshMode",
-     "field_offset" : 96,
-     "referenced_type" : "type-586"
-    },
-    {
-     "field_name" : "nAirMBs",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nAirRef",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nCirMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eAccuracy",
-     "field_offset" : 96,
-     "referenced_type" : "type-584"
-    },
-    {
-     "field_name" : "bUnrestrictedMVs",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bFourMV",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sXSearchRange",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sYSearchRange",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 160,
-     "referenced_type" : "type-595"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 192,
-     "referenced_type" : "type-596"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeaderSpacing",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bSVH",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGov",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPFrames",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBFrames",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIDCVLCThreshold",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bACPred",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxPacketSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTimeIncRes",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 384,
-     "referenced_type" : "type-598"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 416,
-     "referenced_type" : "type-599"
-    },
-    {
-     "field_name" : "nAllowedPictureTypes",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nHeaderExtension",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bReversibleVLC",
-     "field_offset" : 512,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 68,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 128,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nProfileIndex",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpI",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpP",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nQpB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-603"
-    },
-    {
-     "field_name" : "nBitsPerPixel",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedWidth",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nPaddedHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "nFrameRate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamFlags",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitstreamVersion",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxEncodeFrameSize",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnablePostFilter",
-     "field_offset" : 320,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableTemporalInterpolation",
-     "field_offset" : 352,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLatencyMode",
-     "field_offset" : 384,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
-   "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
-   "size" : 52,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "b16x16",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b16x8",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x16",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x8",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b8x4",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x8",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "b4x4",
-     "field_offset" : 288,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableVFU",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nFirstGOB",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFirstMB",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nNumMBs",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "nDCTPartitions",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP8TYPE",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 28,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP8TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eProfile",
-     "field_offset" : 96,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "eLevel",
-     "field_offset" : 128,
-     "referenced_type" : "type-172"
-    },
-    {
-     "field_name" : "bErrorResilientMode",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nTileRows",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nTileColumns",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnableFrameParallelDecoding",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "name" : "OMX_VIDEO_PARAM_VP9TYPE",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_PARAM_VP9TYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "eFormat",
-     "field_offset" : 96,
-     "referenced_type" : "type-601"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cMIMEType",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "pNativeRender",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nBitrate",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "xFramerate",
-     "field_offset" : 224,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bFlagErrorConcealment",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "eCompressionFormat",
-     "field_offset" : 288,
-     "referenced_type" : "type-14"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pNativeWindow",
-     "field_offset" : 352,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
-   "size" : 48,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nMediaTimeUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "nSystemTimeNs",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "name" : "OMX_VIDEO_RENDEREVENTTYPE",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_RENDEREVENTTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bDepedentSegments",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bEnableLoopFilterAcrossSlices",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "name" : "OMX_VIDEO_SLICESEGMENTSTYPE",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_SLICESEGMENTSTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bIsIntraFrame",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bIsGoldenOrAlternateFrame",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bPreviousFrameRefresh",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bGoldenFrameRefresh",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bAlternateFrameRefresh",
-     "field_offset" : 160,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUsePreviousFrame",
-     "field_offset" : 192,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseGoldenFrame",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bUseAlternateFrame",
-     "field_offset" : 256,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "name" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 36,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_VideoExt.h",
-   "unique_id" : "OMX_VIDEO_VP8REFERENCEFRAMETYPE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMeta",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCapacity",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeOffset",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRangeLength",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInt32Data",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsData",
-     "field_offset" : 256,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::ABuffer",
-   "name" : "android::ABuffer",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h",
-   "unique_id" : "_ZTSN7android7ABufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ABufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ABufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "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-915",
-   "self_type" : "type-915",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ADebug",
-   "name" : "android::ADebug",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "unique_id" : "_ZTSN7android6ADebugE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mID",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 96,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVerboseStats",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessageCounter",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMessages",
-     "field_offset" : 224,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android::AHandler",
-   "name" : "android::AHandler",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
-   "unique_id" : "_ZTSN7android8AHandlerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AHandlerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AHandlerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8AHandler17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-69"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 384,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "name" : "android::AHandlerReflector<android::SimpleSoftOMXComponent>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android17AHandlerReflectorINS_22SimpleSoftOMXComponentEE17onMessageReceivedERKNS_2spINS_8AMessageEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueChangedCondition",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mEventQueue",
-     "field_offset" : 224,
-     "referenced_type" : "type-80"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 288,
-     "referenced_type" : "type-84"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunningLocally",
-     "field_offset" : 320,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesLock",
-     "field_offset" : 352,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRepliesCondition",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ALooper",
-   "name" : "android::ALooper",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 52,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooperE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7ALooperE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7ALooperD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mMessage",
-     "field_offset" : 64,
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::ALooper::Event",
-   "name" : "android::ALooper::Event",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
-   "unique_id" : "_ZTSN7android7ALooper5EventE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mWhat",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTarget",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 128,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 192,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItems",
-     "field_offset" : 256,
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AMessage",
-   "name" : "android::AMessage",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 1828,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessageE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8AMessageE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8AMessageD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "u",
-     "referenced_type" : "type-105"
-    },
-    {
-     "field_name" : "mName",
-     "field_offset" : 128,
-     "referenced_type" : "type-111"
-    },
-    {
-     "field_name" : "mNameLength",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mType",
-     "field_offset" : 192,
-     "referenced_type" : "type-113"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Item",
-   "name" : "android::AMessage::Item",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 28,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "int32Value",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "int64Value",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "sizeValue",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "floatValue",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "doubleValue",
-     "referenced_type" : "type-107"
-    },
-    {
-     "field_name" : "ptrValue",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "refValue",
-     "referenced_type" : "type-108"
-    },
-    {
-     "field_name" : "stringValue",
-     "referenced_type" : "type-109"
-    },
-    {
-     "field_name" : "rectValue",
-     "referenced_type" : "type-110"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
-   "record_kind" : "union",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mLeft",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mTop",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRight",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mBottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::AMessage::Rect",
-   "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android8AMessage4RectE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 64,
-     "referenced_type" : "type-70"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReply",
-     "field_offset" : 128,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReplied",
-     "field_offset" : 160,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::AReplyToken",
-   "name" : "android::AReplyToken",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "unique_id" : "_ZTSN7android11AReplyTokenE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11AReplyTokenE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11AReplyTokenD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "referenced_type" : "type-78"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllocSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::AString",
-   "name" : "android::AString",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 12,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
-   "unique_id" : "_ZTSN7android7AStringE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mProfile",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::CodecProfileLevel",
-   "name" : "android::CodecProfileLevel",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android17CodecProfileLevelE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mRange",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "mPrimaries",
-     "field_offset" : 32,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "mTransfer",
-     "field_offset" : 64,
-     "referenced_type" : "type-35"
-    },
-    {
-     "field_name" : "mMatrixCoeffs",
-     "field_offset" : 96,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::ColorAspects",
-   "name" : "android::ColorAspects",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android12ColorAspectsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ColorUtils",
-   "name" : "android::ColorUtils",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "unique_id" : "_ZTSN7android10ColorUtilsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bTunneled",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nAudioHwSync",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pSidebandWindow",
-     "field_offset" : 160,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
-   "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bRequestingDataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "bDataSpaceChanged",
-     "field_offset" : 128,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nPixelFormat",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nDataSpace",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sAspects",
-     "field_offset" : 224,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorAspectsParams",
-   "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 44,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormat2Params",
-   "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 136,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "eColorFormat",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "nFrameWidth",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nFrameHeight",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nStride",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nSliceHeight",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bUsingNativeBuffers",
-     "field_offset" : 224,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "sMediaImage",
-     "field_offset" : 256,
-     "referenced_type" : "type-143"
-    }
-   ],
-   "linker_set_key" : "android::DescribeColorFormatParams",
-   "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 112,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSize",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nParamSizeUsed",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nValue",
-     "field_offset" : 160,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
-   "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sInfo",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::DescribeHDRStaticInfoParams",
-   "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 40,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "enable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
-   "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Flattenable<android::Fence>",
-   "name" : "android::Flattenable<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-402" ],
-   "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::FlattenableUtils",
-   "name" : "android::FlattenableUtils",
-   "record_kind" : "class",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "unique_id" : "_ZTSN7android16FlattenableUtilsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nUsage",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
-   "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mID",
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_offset" : 8,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo",
-   "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 25,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "sType1",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "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-41",
-   "self_type" : "type-41",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Primaries1",
-   "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mR",
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mG",
-     "field_offset" : 32,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mB",
-     "field_offset" : 64,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mW",
-     "field_offset" : 96,
-     "referenced_type" : "type-43"
-    },
-    {
-     "field_name" : "mMaxDisplayLuminance",
-     "field_offset" : 128,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMinDisplayLuminance",
-     "field_offset" : 144,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxContentLightLevel",
-     "field_offset" : 160,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mMaxFrameAverageLightLevel",
-     "field_offset" : 176,
-     "referenced_type" : "type-44"
-    }
-   ],
-   "linker_set_key" : "android::HDRStaticInfo::Type1",
-   "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-96"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
-   "name" : "android::KeyedVector<unsigned int, unsigned int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Point>",
-   "name" : "android::LightFlattenable<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-404" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::LightFlattenable<android::Rect>",
-   "name" : "android::LightFlattenable<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-406" ],
-   "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-403"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Point>",
-   "name" : "android::LightFlattenablePod<android::Point>",
-   "record_kind" : "class",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-410" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-405"
-    }
-   ],
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
-   "name" : "android::LightFlattenablePod<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-412" ],
-   "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-326"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::Fence>",
-   "name" : "android::LightRefBase<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-327" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-519"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-520" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<BufferInfo *>::NON_CONST_ITERATOR<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-712"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "name" : "android::List<BufferInfo *>::_ListIterator<android::SimpleSoftOMXComponent::BufferInfo *, android::List<BufferInfo *>::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-255"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<BufferInfo *>::_Node",
-   "name" : "android::List<BufferInfo *>::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "android::List<android::ALooper::Event>",
-   "name" : "android::List<android::ALooper::Event>",
-   "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-83" ],
-   "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_7ALooper5EventEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_7ALooper5EventEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-253"
-    }
-   ],
-   "linker_set_key" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "name" : "android::List<android::SimpleSoftOMXComponent::BufferInfo *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-255" ],
-   "unique_id" : "_ZTSN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListIPNS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mpMiddle",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<android::sp<android::ABuffer> >",
-   "name" : "android::List<android::sp<android::ABuffer> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4ListINS_2spINS_7ABufferEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4ListINS_2spINS_7ABufferEEEED0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-117",
-   "self_type" : "type-117",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE14CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "name" : "android::List<sp<ABuffer> >::NON_CONST_ITERATOR<android::sp<android::ABuffer> >",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE18NON_CONST_ITERATORIS3_EE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-115"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_14CONST_ITERATOREEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mpNode",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "name" : "android::List<sp<ABuffer> >::_ListIterator<android::sp<android::ABuffer>, android::List<sp<ABuffer> >::NON_CONST_ITERATOR>",
-   "record_kind" : "class",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE13_ListIteratorIS3_NS4_18NON_CONST_ITERATOREEE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "referenced_type" : "type-61"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpPrev",
-     "field_offset" : 32,
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mpNext",
-     "field_offset" : 64,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::List<sp<ABuffer> >::_Node",
-   "name" : "android::List<sp<ABuffer> >::_Node",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/List.h",
-   "unique_id" : "_ZTSN7android4ListINS_2spINS_7ABufferEEEE5_NodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-144"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 160,
-     "referenced_type" : "type-145"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage",
-   "name" : "android::MediaImage",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
-   "size" : 80,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImageE"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mType",
-     "referenced_type" : "type-149"
-    },
-    {
-     "field_name" : "mNumPlanes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mBitDepthAllocated",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mPlane",
-     "field_offset" : 192,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2",
-   "name" : "android::MediaImage2",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
-   "size" : 104,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage2E"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage2::PlaneInfo",
-   "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mOffset",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mColInc",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mRowInc",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mHorizSubsampling",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mVertSubsampling",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::MediaImage::PlaneInfo",
-   "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 20,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-774"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase",
-   "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-971",
-   "self_type" : "type-971",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
-   "unique_id" : "_ZTSN7android13OMXPluginBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13OMXPluginBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13OMXPluginBaseD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19enumerateComponentsEPcjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android13OMXPluginBase19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "nMaxFrameWidth",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nMaxFrameHeight",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
-   "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "bEnable",
-     "field_offset" : 64,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
-   "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-783"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-257"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 256,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLooper",
-     "field_offset" : 288,
-     "referenced_type" : "type-230"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandler",
-     "field_offset" : 320,
-     "referenced_type" : "type-231"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 352,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTargetState",
-     "field_offset" : 384,
-     "referenced_type" : "type-236"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPorts",
-     "field_offset" : 416,
-     "referenced_type" : "type-237"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameConfig",
-     "field_offset" : 576,
-     "referenced_type" : "type-256"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent",
-   "name" : "android::SimpleSoftOMXComponent",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 76,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22SimpleSoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mHeader",
-     "referenced_type" : "type-210"
-    },
-    {
-     "field_name" : "mOwnedByUs",
-     "field_offset" : 32,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "mFrameConfig",
-     "field_offset" : 40,
-     "referenced_type" : "type-88"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "name" : "android::SimpleSoftOMXComponent::BufferInfo",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent10BufferInfoE"
-  },
-  {
-   "access" : "protected",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDef",
-     "referenced_type" : "type-239"
-    },
-    {
-     "field_name" : "mBuffers",
-     "field_offset" : 768,
-     "referenced_type" : "type-250"
-    },
-    {
-     "field_name" : "mQueue",
-     "field_offset" : 928,
-     "referenced_type" : "type-252"
-    },
-    {
-     "field_name" : "mTransition",
-     "field_offset" : 992,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SimpleSoftOMXComponent::PortInfo",
-   "name" : "android::SimpleSoftOMXComponent::PortInfo",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 128,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SimpleSoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android22SimpleSoftOMXComponent8PortInfoE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
-   "name" : "android::Singleton<android::GraphicBufferMapper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-414" ],
-   "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mName",
-     "field_offset" : 64,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallbacks",
-     "field_offset" : 160,
-     "referenced_type" : "type-258"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponent",
-     "field_offset" : 192,
-     "referenced_type" : "type-267"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLibHandle",
-     "field_offset" : 224,
-     "referenced_type" : "type-99"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXComponent",
-   "name" : "android::SoftOMXComponent",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXComponent.h",
-   "unique_id" : "_ZTSN7android16SoftOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SoftOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SoftOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent8getStateEP13OMX_STATETYPE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-971"
-    }
-   ],
-   "linker_set_key" : "android::SoftOMXPlugin",
-   "name" : "android::SoftOMXPlugin",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h",
-   "unique_id" : "_ZTSN7android13SoftOMXPluginE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13SoftOMXPluginE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13SoftOMXPluginD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin21makeComponentInstanceEPKcPK16OMX_CALLBACKTYPEPvPP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin24destroyComponentInstanceEP17OMX_COMPONENTTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19enumerateComponentsEPcjj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android13SoftOMXPlugin19getRolesOfComponentEPKcPNS_6VectorINS_7String8EEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mIsAdaptive",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mAdaptiveMaxHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropLeft",
-     "field_offset" : 736,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropTop",
-     "field_offset" : 768,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropWidth",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCropHeight",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputFormat",
-     "field_offset" : 864,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHdrStaticInfo",
-     "field_offset" : 896,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mOutputPortSettingsChange",
-     "field_offset" : 1120,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mUpdateColorAspects",
-     "field_offset" : 1152,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorAspectsLock",
-     "field_offset" : 1184,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mDefaultColorAspects",
-     "field_offset" : 1216,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitstreamColorAspects",
-     "field_offset" : 1344,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFinalColorAspects",
-     "field_offset" : 1472,
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinInputBufferSize",
-     "field_offset" : 1600,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 1632,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 1664,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 1696,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 1728,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 1760,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusInputs",
-     "field_offset" : 1792,
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHdr10PlusOutputs",
-     "field_offset" : 1856,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoDecoderOMXComponent",
-   "name" : "android::SoftVideoDecoderOMXComponent",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 240,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoDecoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoDecoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoDecoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent7onResetEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportsDescribeColorAspectsEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent24getColorAspectPreferenceEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdrStaticInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent28supportDescribeHdr10PlusInfoEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoDecoderOMXComponent21updatePortDefinitionsEbb"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-229"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mInputDataIsMeta",
-     "field_offset" : 584,
-     "referenced_type" : "type-88"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mWidth",
-     "field_offset" : 608,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mHeight",
-     "field_offset" : 640,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mBitrate",
-     "field_offset" : 672,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramerate",
-     "field_offset" : 704,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mColorFormat",
-     "field_offset" : 736,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGrallocModule",
-     "field_offset" : 768,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinOutputBufferSize",
-     "field_offset" : 800,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMinCompressionRatio",
-     "field_offset" : 832,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mComponentRole",
-     "field_offset" : 864,
-     "referenced_type" : "type-111"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodingType",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProfileLevels",
-     "field_offset" : 928,
-     "referenced_type" : "type-226"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumProfileLevels",
-     "field_offset" : 960,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::SoftVideoEncoderOMXComponent",
-   "name" : "android::SoftVideoEncoderOMXComponent",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 124,
-   "source_file" : "/frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/SoftVideoEncoderOMXComponent.h",
-   "unique_id" : "_ZTSN7android28SoftVideoEncoderOMXComponentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android28SoftVideoEncoderOMXComponentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16SoftOMXComponent9initCheckEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21prepareForDestructionEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent11sendCommandE15OMX_COMMANDTYPEjPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12getParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent12setParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16SoftOMXComponent9getConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9setConfigE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent17getExtensionIndexEPKcP13OMX_INDEXTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent9useBufferEPP20OMX_BUFFERHEADERTYPEjPvjPh"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14allocateBufferEPP20OMX_BUFFERHEADERTYPEjPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent10freeBufferEjP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent15emptyThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent14fillThisBufferEP20OMX_BUFFERHEADERTYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent8getStateEP13OMX_STATETYPE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalGetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android28SoftVideoEncoderOMXComponent20internalSetParameterE13OMX_INDEXTYPEPv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent17internalSetConfigE13OMX_INDEXTYPEPvPb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent13onQueueFilledEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent20onPortFlushCompletedEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent21onPortEnableCompletedEjb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22SimpleSoftOMXComponent7onResetEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::SortedVector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIjjEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE10do_compareEPKvS5_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bStoreMetaData",
-     "field_offset" : 96,
-     "referenced_type" : "type-24"
-    }
-   ],
-   "linker_set_key" : "android::StoreMetaDataInBuffersParams",
-   "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
-   "size" : 16,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-111"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-73"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-766"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-763"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "nSize",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "field_name" : "nPortIndex",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pAppPrivate",
-     "field_offset" : 96,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "bufferHeader",
-     "field_offset" : 128,
-     "referenced_type" : "type-209"
-    },
-    {
-     "field_name" : "nativeBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-213"
-    }
-   ],
-   "linker_set_key" : "android::UseAndroidNativeBufferParams",
-   "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 24,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::BufferInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent10BufferInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::Vector<android::SimpleSoftOMXComponent::PortInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_22SimpleSoftOMXComponent8PortInfoEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-98"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-101"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-197"
-    }
-   ],
-   "linker_set_key" : "android::VideoDecoderOutputMetaData",
-   "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-198"
-    }
-   ],
-   "linker_set_key" : "android::VideoGrallocMetadata",
-   "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-207"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeHandleMetadata",
-   "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "eType",
-     "referenced_type" : "type-192"
-    },
-    {
-     "field_name" : "pBuffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-204"
-    },
-    {
-     "field_name" : "nFenceFd",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android::VideoNativeMetadata",
-   "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
-   "size" : 12,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
-   "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-518"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_AUnion_impl",
-   "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
-   "unique_id" : "_ZTSN7android12_AUnion_implE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::_Flagged_helper",
-   "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-913",
-   "self_type" : "type-913",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
-   "unique_id" : "_ZTSN7android15_Flagged_helperE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-912"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<>",
-   "name" : "android::are_unique<>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-902"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-899"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-898",
-   "self_type" : "type-898",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-897"
-    }
-   ],
-   "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-896",
-   "self_type" : "type-896",
-   "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"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-895"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-888"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-887",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-891"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-908"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-906"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-910"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<sp<RefBase> >",
-   "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-893"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-904"
-    }
-   ],
-   "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-825"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-828"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-827",
-   "self_type" : "type-827",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-827"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-829"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-828",
-   "self_type" : "type-828",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-826"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-830"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
-   "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-819"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-818"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-820"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-817"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-821"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::AString>",
-   "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-77" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-800"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-803" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-801"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-802" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-806"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-807"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-808"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
-   "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-64" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-797"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
-   "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-798" ],
-   "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-833"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-832"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-836"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-835"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-837"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
-   "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-834"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-838"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<double>",
-   "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-844"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-843"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-842"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-847"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-846"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-848"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
-   "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-845"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-849"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<float>",
-   "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-880"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-879"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-878"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-877",
-   "self_type" : "type-877",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-877"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-875"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-883"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-882"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-884"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
-   "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-883",
-   "self_type" : "type-883",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-876"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-881"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-885"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<int>",
-   "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-884",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-867"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-866",
-   "self_type" : "type-866",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-866"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-865"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-864"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-870"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-869"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-871"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-863"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-868"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-872"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<long long>",
-   "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-855"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-854"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-853"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-852"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-858"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-857",
-   "self_type" : "type-857",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-857"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-859"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-856"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-860"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<unsigned int>",
-   "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-812"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-811",
-   "self_type" : "type-811",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-811"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-813"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
-   "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-814"
-    }
-   ],
-   "linker_set_key" : "android::is_one_of<void *>",
-   "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
-   "size" : 1,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-99" ],
-   "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "name" : "android::key_value_pair_t<unsigned int, unsigned int>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-2" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ABuffer>",
-   "name" : "android::sp<android::ABuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_7ABufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandler>",
-   "name" : "android::sp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "name" : "android::sp<android::AHandlerReflector<android::SimpleSoftOMXComponent> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-233" ],
-   "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_22SimpleSoftOMXComponentEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
-   "name" : "android::sp<android::ALooper::LooperThread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-87" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::ALooper>",
-   "name" : "android::sp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::AMessage>",
-   "name" : "android::sp<android::AMessage>",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-337"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent>",
-   "name" : "android::sp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2spINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-678"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::SoftOMXComponent>",
-   "name" : "android::sp<android::SoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-977",
-   "self_type" : "type-977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-257" ],
-   "unique_id" : "_ZTSN7android2spINS_16SoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-764"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-765" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-931"
-    }
-   ],
-   "linker_set_key" : "android::sp<const android::AHandler>",
-   "name" : "android::sp<const android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-932" ],
-   "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_pointer<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<unsigned int>",
-   "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_copy<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-985",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-989",
-   "self_type" : "type-989",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-51",
-   "self_type" : "type-51",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_ctor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-940",
-   "self_type" : "type-940",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-861",
-   "self_type" : "type-861",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-55",
-   "self_type" : "type-55",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-987",
-   "self_type" : "type-987",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-958",
-   "self_type" : "type-958",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_dtor<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-636",
-   "self_type" : "type-636",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "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-57",
-   "self_type" : "type-57",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-988",
-   "self_type" : "type-988",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "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-959",
-   "self_type" : "type-959",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::trait_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-960" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "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-677",
-   "self_type" : "type-677",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-79" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-107" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-106" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-422" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-5" ],
-   "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-6",
-   "self_type" : "type-6",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-136" ],
-   "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-54",
-   "self_type" : "type-54",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-26" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::traits<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android6traitsINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "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-750",
-   "self_type" : "type-750",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<unsigned int>",
-   "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
-   "unique_id" : "_ZTSN7android6traitsIjEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-365"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::BufferInfo>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-251" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent10BufferInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "name" : "android::use_trivial_move<android::SimpleSoftOMXComponent::PortInfo>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-238" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_22SimpleSoftOMXComponent8PortInfoEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::AHandler>",
-   "name" : "android::wp<android::AHandler>",
-   "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-69" ],
-   "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::ALooper>",
-   "name" : "android::wp<android::ALooper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-72" ],
-   "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-235"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::SimpleSoftOMXComponent>",
-   "name" : "android::wp<android::SimpleSoftOMXComponent>",
-   "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-229" ],
-   "unique_id" : "_ZTSN7android2wpINS_22SimpleSoftOMXComponentEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-186"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-759"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-755"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-757"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-753"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-30"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-761"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-106"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-106"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-99"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-315"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-316"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-317"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-319"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-320"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-321"
-    }
-   ],
-   "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-315",
-   "self_type" : "type-315",
-   "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)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ABuffer> &&",
-   "name" : "android::sp<android::ABuffer> &&",
-   "referenced_type" : "type-61",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> &&",
-   "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-230",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "name" : "android::sp<android::SimpleSoftOMXComponent> &&",
-   "referenced_type" : "type-729",
-   "self_type" : "type-935",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_xmlparser.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_xmlparser.so.lsdump
index cb952d2..52edd3d 100644
--- a/Q/64/x86_x86_64/source-based/libstagefright_xmlparser.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libstagefright_xmlparser.so.lsdump
@@ -1,25 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *[4]",
-   "name" : "const char *[4]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "name" : "std::__1::pair<std::__1::basic_string<char>, android::MediaCodecsXmlParser::CodecProperties> [2048]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 139264,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -28,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 1
   },
   {
@@ -37,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1
   },
   {
@@ -46,8 +26,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 4
   },
   {
@@ -56,66 +36,111 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24"
+   "referenced_type" : "type-40",
+   "self_type" : "type-40"
   }
  ],
  "elf_functions" :
  [
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl12parseXmlPathERKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl25parseXmlFilesInSearchDirsERKNSt3__16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEESD_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl4Data9addGlobalENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEES9_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State12enterIncludeERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State15enterMediaCodecEbPKcS4_b"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9addDetailERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5State9enterTypeEPKcb"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC1EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl5StateC2EPNS1_4DataE"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addFeatureEPPKc"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser10addSettingEPPKcS4_"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12parseXmlFileEv"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser12updateStatusEi"
   },
   {
-   "name" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_"
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser13limitVariantsEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser14includeXmlFileEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser15enterMediaCodecEPPKcb"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser16updateMediaCodecEPKcRKNSt3__13setINS5_12basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEENS5_4lessISC_EENSA_ISC_EEEESI_S4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser17endElementHandlerEPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser19startElementHandlerEPKcPS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser24EndElementHandlerWrapperEPvPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser26StartElementHandlerWrapperEPvPKcPS5_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addAliasEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addLimitEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser8addQuirkEPPKcS4_"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6Parser9enterTypeEPPKc"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC1EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParser4Impl6ParserC2EPNS1_5StateENSt3__112basic_stringIcNS5_11char_traitsIcEENS5_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC1Ev"
+  },
+  {
+   "name" : "_ZN7android20MediaCodecsXmlParserC2Ev"
   },
   {
    "name" : "_ZN7android20MediaCodecsXmlParserD1Ev"
@@ -130,19 +155,39 @@
    "name" : "_ZNK7android20MediaCodecsXmlParser11getCodecMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv"
-  },
-  {
    "name" : "_ZNK7android20MediaCodecsXmlParser15getCommonPrefixEv"
   },
   {
    "name" : "_ZNK7android20MediaCodecsXmlParser16getParsingStatusEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
   },
   {
-   "name" : "_ZNK7android20MediaCodecsXmlParser22getServiceAttributeMapEv"
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl10getRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15generateRoleMapEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl15getCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl20generateCommonPrefixEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl5State21lastNonIncludeSectionEv"
+  },
+  {
+   "name" : "_ZNK7android20MediaCodecsXmlParser4Impl6Parser12logAnyErrorsERKNS1_6ResultE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__count_uniqueIS6_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
    "binding" : "weak",
@@ -150,6 +195,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -214,6 +271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS_19__map_value_compareIS7_S8_NS_4lessIS7_EELb1EEENS5_IS8_EEE4findIS7_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
   },
   {
@@ -234,11 +295,47 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SD_EEiEERPNS_15__tree_end_nodeISF_EESG_RKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE12__find_equalIS6_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISF_EERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJPKcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE15__emplace_multiIJRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRA20_KcEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE21__emplace_unique_implIJRPKciEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRKS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE25__emplace_unique_key_argsIS6_JRS6_EEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE30__emplace_hint_unique_key_argsIS6_JRKS6_EEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SI_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE4findIS6_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS6_EENS4_IS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
   },
   {
    "binding" : "weak",
@@ -246,7 +343,31 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser7SectionENS_9allocatorIS3_EEE21__push_back_slow_pathIRKS3_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE24__emplace_back_slow_pathIJS5_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl5State12CodecAndTypeENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE24__emplace_back_slow_pathIJS4_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android20MediaCodecsXmlParser4Impl7SectionENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE24__emplace_back_slow_pathIJRKS6_EEEvDpOT_"
   },
   {
    "binding" : "weak",
@@ -254,6 +375,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE21__push_back_slow_pathIRKSB_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_3setINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_4lessIS7_EENS5_IS7_EEEENS5_ISB_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -269,389 +402,78 @@
  [
   {
    "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE"
-  }
- ],
- "enum_types" :
- [
+  },
   {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::MediaCodecsXmlParser::SECTION_TOPLEVEL"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::MediaCodecsXmlParser::SECTION_SETTINGS"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODERS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::MediaCodecsXmlParser::SECTION_DECODER_TYPE"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODERS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::MediaCodecsXmlParser::SECTION_ENCODER_TYPE"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::MediaCodecsXmlParser::SECTION_INCLUDE"
-    }
-   ],
-   "linker_set_key" : "android::MediaCodecsXmlParser::Section",
-   "name" : "android::MediaCodecsXmlParser::Section",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android20MediaCodecsXmlParser7SectionE"
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_pointerIPN7android20MediaCodecsXmlParser4ImplENS_14default_deleteIS3_EENS_9allocatorIS3_EEEE"
   }
  ],
+ "enum_types" : [],
  "function_types" : [],
  "functions" :
  [
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addFeature",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser10addFeatureEPPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlPath",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXmlPathERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser12parseXMLFileEPKc",
+   "function_name" : "android::MediaCodecsXmlParser::parseXmlFilesInSearchDirs",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25parseXmlFilesInSearchDirsERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEESC_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::includeXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser14includeXMLFileEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::endElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17endElementHandlerEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::startElementHandler",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser19startElementHandlerEPKcPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::parseTopLevelXMLFile",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser20parseTopLevelXMLFileEPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-32"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addTypeFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser21addTypeFromAttributesEPPKcb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::EndElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24EndElementHandlerWrapperEPvPKc",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addSettingFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser24addSettingFromAttributesEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::StartElementHandlerWrapper",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser26StartElementHandlerWrapperEPvPKcPS3_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-49"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-24",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addMediaCodecFromAttributes",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser27addMediaCodecFromAttributesEbPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addAlias",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addAliasEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addLimit",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addLimitEPPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::addQuirk",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser8addQuirkEPPKcS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-2",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "function_name" : "android::MediaCodecsXmlParser::MediaCodecsXmlParser",
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2EPKPKcS2_S2_S2_",
+   "linker_set_key" : "_ZN7android20MediaCodecsXmlParserC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-26"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -661,10 +483,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -674,10 +496,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-40",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -687,10 +509,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -700,24 +522,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-43",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateRoleMap",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser15generateRoleMapEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-15",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -727,10 +535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-36",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -740,24 +548,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::MediaCodecsXmlParser::generateCommonPrefix",
-   "linker_set_key" : "_ZNK7android20MediaCodecsXmlParser20generateCommonPrefixEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-24",
+   "return_type" : "type-21",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -767,37 +561,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-10",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
  "global_vars" :
  [
   {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser17defaultSearchDirsE",
-   "name" : "android::MediaCodecsXmlParser::defaultSearchDirs",
-   "referenced_type" : "type-22",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser18defaultMainXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultMainXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android20MediaCodecsXmlParser25defaultPerformanceXmlNameE",
-   "name" : "android::MediaCodecsXmlParser::defaultPerformanceXmlName",
-   "referenced_type" : "type-23",
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
    "linker_set_key" : "_ZN7android20MediaCodecsXmlParser30defaultProfilingResultsXmlPathE",
    "name" : "android::MediaCodecsXmlParser::defaultProfilingResultsXmlPath",
-   "referenced_type" : "type-23",
+   "referenced_type" : "type-39",
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
  ],
@@ -805,10 +581,19 @@
  [
   {
    "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-33",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > > &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -816,8 +601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > > &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -825,8 +610,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
+   "referenced_type" : "type-30",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -838,7 +632,7 @@
    "linker_set_key" : "android::MediaCodecsXmlParser *",
    "name" : "android::MediaCodecsXmlParser *",
    "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -846,8 +640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::MediaCodecsXmlParser *",
    "name" : "const android::MediaCodecsXmlParser *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-42",
+   "referenced_type" : "type-13",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -855,35 +649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char **",
-   "name" : "const char **",
-   "referenced_type" : "type-19",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const *",
-   "name" : "const char *const *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -896,8 +663,8 @@
    "linker_set_key" : "const android::MediaCodecsXmlParser",
    "name" : "const android::MediaCodecsXmlParser",
    "referenced_type" : "type-1",
-   "self_type" : "type-41",
-   "size" : 139384,
+   "self_type" : "type-13",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -905,8 +672,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -915,19 +682,19 @@
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-23",
+   "referenced_type" : "type-36",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const char *const[4]",
-   "name" : "const char *const[4]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
-   "size" : 16,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
   {
@@ -935,8 +702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::CodecProperties> > >",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -945,8 +712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, android::MediaCodecsXmlParser::RoleProperties> > >",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   },
@@ -955,8 +722,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
    "name" : "const std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
+   "size" : 12,
+   "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h"
   }
@@ -969,92 +746,8 @@
    [
     {
      "access" : "private",
-     "field_name" : "mParsingStatus",
+     "field_name" : "mImpl",
      "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentSection",
-     "field_offset" : 32,
-     "referenced_type" : "type-3"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mUpdate",
-     "field_offset" : 64,
-     "referenced_type" : "type-5"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSectionStack",
-     "field_offset" : 96,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHrefBase",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mServiceAttributeMap",
-     "field_offset" : 288,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentName",
-     "field_offset" : 384,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecSet",
-     "field_offset" : 480,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecListTemp",
-     "field_offset" : 576,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecMap",
-     "field_offset" : 1114688,
-     "referenced_type" : "type-13"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCodecCounter",
-     "field_offset" : 1114784,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentCodec",
-     "field_offset" : 1114816,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentType",
-     "field_offset" : 1114848,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRoleMap",
-     "field_offset" : 1114880,
-     "referenced_type" : "type-16"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCommonPrefix",
-     "field_offset" : 1114976,
-     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser",
@@ -1062,7 +755,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-1",
    "self_type" : "type-1",
-   "size" : 139384,
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParserE"
   },
@@ -1072,39 +765,49 @@
    [
     {
      "field_name" : "isEncoder",
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "order",
      "field_offset" : 32,
-     "referenced_type" : "type-4"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "quirkSet",
      "field_offset" : 64,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "domainSet",
+     "field_offset" : 160,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "variantSet",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
     },
     {
      "field_name" : "typeMap",
-     "field_offset" : 160,
-     "referenced_type" : "type-29"
+     "field_offset" : 352,
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "aliases",
-     "field_offset" : 256,
-     "referenced_type" : "type-30"
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "rank",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
+     "field_offset" : 544,
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::CodecProperties",
    "name" : "android::MediaCodecsXmlParser::CodecProperties",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 56,
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
+   "size" : 80,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser15CodecPropertiesE"
   },
@@ -1114,18 +817,18 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "attributeList",
      "field_offset" : 96,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-5"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::NodeInfo",
    "name" : "android::MediaCodecsXmlParser::NodeInfo",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser8NodeInfoE"
@@ -1136,23 +839,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-7"
     },
     {
      "field_name" : "isEncoder",
      "field_offset" : 96,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nodeList",
      "field_offset" : 128,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-9"
     }
    ],
    "linker_set_key" : "android::MediaCodecsXmlParser::RoleProperties",
    "name" : "android::MediaCodecsXmlParser::RoleProperties",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h",
    "unique_id" : "_ZTSN7android20MediaCodecsXmlParser14RolePropertiesE"